Add another container: ascn, layered on klarlack

Here we are going to move the custom software install (watermarker etc) which we need
for the primary sponsor.

For now, the new container is just the same as the klarlack image

.gitlab-ci.yml

@@ -16,15 +16,18 @@ push_to_docker:
     - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/haproxy:$CI_COMMIT_REF_NAME
     - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/varnish:$CI_COMMIT_REF_NAME
     - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/klarlack:$CI_COMMIT_REF_NAME
+    - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/ascn:$CI_COMMIT_REF_NAME
     - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/controller:$CI_COMMIT_REF_NAME
     - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/haproxy:$CI_COMMIT_REF_NAME uplex/viking-haproxy:$CI_COMMIT_TAG
     - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/varnish:$CI_COMMIT_REF_NAME uplex/viking-varnish:$CI_COMMIT_TAG
     - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/klarlack:$CI_COMMIT_REF_NAME uplex/viking-klarlack:$CI_COMMIT_TAG
+    - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/ascn:$CI_COMMIT_REF_NAME uplex/viking-ascn:$CI_COMMIT_TAG
     - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/controller:$CI_COMMIT_REF_NAME uplex/viking-controller:$CI_COMMIT_TAG
     - docker login -u "$DOCKERHUB_USER" -p "$DOCKERHUB_CREDS"
     - docker push uplex/viking-haproxy:$CI_COMMIT_TAG
     - docker push uplex/viking-varnish:$CI_COMMIT_TAG
     - docker push uplex/viking-klarlack:$CI_COMMIT_TAG
+    - docker push uplex/viking-ascn:$CI_COMMIT_TAG
     - docker push uplex/viking-controller:$CI_COMMIT_TAG
 
 test:
@@ -84,6 +87,25 @@ build:klarlack:manual:
   extends: .build-klarlack
   when: manual
 
+# ascn: same as klarlack, plus Dockerfile.ascn
+build:ascn:
+  extends: .build-ascn
+  rules:
+    - changes:
+      - container/Dockerfile.ascn
+      - container/Dockerfile.klarlack
+      - container/varnishd_exec.sh
+      - container/start.cli
+      - container/bogo_backend.vcl
+      - container/boot.vcl
+      - container/notavailable.vcl
+      - container/ok.vcl
+
+# ascn image can be build when user triggers it
+build:ascn:manual:
+  extends: .build-ascn
+  when: manual
+
 # build new varnish image after changes in: dockerfile, exec script,
 # varnishd -I init script, initial VCLs, repo lists
 build:varnish:
@@ -358,6 +380,16 @@ dev:probe-config:
     - cd container
     - make klarlack
 
+# basic step for a pipeline to build the ascn image
+.build-ascn:
+  extends: .build-image
+  stage: build
+  variables:
+    IMAGE: ascn
+  script:
+    - cd container
+    - make ascn
+
 # basic step for a pipeline to build the haproxy image
 .build-haproxy:
   extends: .build-image

container/Dockerfile.ascn

+FROM varnish-ingress/klarlack
+
+RUN apt-get remove -y -q curl gnupg && \
+    apt-get autoremove -y -q && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /usr/share/doc && \
+    rm -rf /usr/share/man
+
+ENV HTTP_PORT=8888 PROTO=HTTP READY_PORT=8080 SECRET_PATH=/var/run/varnish \
+    SECRET_FILE=_.secret ADMIN_PORT=6081 GROUP=varnish \
+    OFFLOAD_PATH=/var/run/offload/varnish.sock CONFIG_PORT=8000
+
+ENTRYPOINT ["/varnishd_exec.sh"]

container/Makefile

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-all: controller varnish haproxy klarlack
+all: controller varnish haproxy klarlack ascn
 
 DOCKER_BUILD_OPTIONS =
 
@@ -53,6 +53,10 @@ klarlack: Dockerfile.klarlack docker-minikube
 	docker build $(DOCKER_BUILD_OPTIONS) -t $(IMAGE_REPO)varnish-ingress/klarlack \
 	-f Dockerfile.klarlack .
 
+ascn: Dockerfile.ascn docker-minikube
+	docker build $(DOCKER_BUILD_OPTIONS) -t $(IMAGE_REPO)varnish-ingress/ascn \
+	-f Dockerfile.ascn .
+
 haproxy: Dockerfile.haproxy docker-minikube
 	docker build $(DOCKER_BUILD_OPTIONS) -t $(IMAGE_REPO)varnish-ingress/haproxy \
 	-f Dockerfile.haproxy .