Merge pull request #26 from City-of-Helsinki/UHF-9884

UHF-9884: Added entrypoints
City-of-Helsinki · Apr 2, 2024 · 511d1cd · 511d1cd
2 parents cca2081 + 280fe1b
commit 511d1cd
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 10 deletions.
diff --git a/openshift/drupal-repository/Dockerfile b/openshift/drupal-repository/Dockerfile
@@ -1,6 +1,12 @@
 FROM alpine:3.19
 COPY --from=almir/webhook /usr/local/bin/webhook /usr/local/bin/webhook
 
+ARG S6_OVERLAY_VERSION=3.1.6.2
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
+RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
+RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
+
 # We need php and git to build satis.
 RUN apk add --no-cache git php82 php82-openssl php82-common php82-json php82-phar php82-mbstring php82-pecl-apcu php82-zip php82-simplexml make
 
@@ -15,5 +21,7 @@ RUN \
 WORKDIR     /etc/webhook
 VOLUME      ["/etc/webhook"]
 EXPOSE      9000
-ENTRYPOINT  ["/usr/local/bin/webhook"]
-CMD ["-verbose", "-hooks=/etc/webhook/hooks.json", "-template", "-hotreload", "-debug"]
+
+# Copy configuration files and scripts
+COPY files/ /
+ENTRYPOINT ["/init"]
diff --git a/openshift/drupal-repository/Makefile b/openshift/drupal-repository/Makefile
@@ -4,16 +4,11 @@ ifeq ($(TAG),)
 	TAG = latest
 endif
 
-.PHONY: build push release
+.PHONY: push release
 
-default: build
-
-run:
-	docker run -it --rm -u 100000 $(REPOSITORY):$(TAG) /bin/sh
-build:
-	docker build -t $(REPOSITORY):$(TAG) ./
+default: push
 
 push:
-	docker push $(REPOSITORY):$(TAG)
+	docker buildx build --pull --platform linux/arm64,linux/amd64 -t $(REPOSITORY):$(TAG) ./ --push
 
 release: build push
diff --git a/openshift/drupal-repository/files/etc/s6-overlay/s6-rc.d/package-queue/run b/openshift/drupal-repository/files/etc/s6-overlay/s6-rc.d/package-queue/run
@@ -0,0 +1,4 @@
+#!/command/with-contenv sh
+cd $PROJECT_DIR
+make
+exec php console.php queue:consume package-queue --item-limit 10;
diff --git a/openshift/drupal-repository/files/etc/s6-overlay/s6-rc.d/package-queue/type b/openshift/drupal-repository/files/etc/s6-overlay/s6-rc.d/package-queue/type
@@ -0,0 +1 @@
+longrun
diff --git a/openshift/drupal-repository/files/etc/s6-overlay/s6-rc.d/user/contents.d/package-queue b/openshift/drupal-repository/files/etc/s6-overlay/s6-rc.d/user/contents.d/package-queue
diff --git a/openshift/drupal-repository/files/etc/s6-overlay/s6-rc.d/user/contents.d/webhook b/openshift/drupal-repository/files/etc/s6-overlay/s6-rc.d/user/contents.d/webhook
diff --git a/...shift/drupal-repository/files/etc/s6-overlay/s6-rc.d/webhook/dependencies.d/package-queue b/...shift/drupal-repository/files/etc/s6-overlay/s6-rc.d/webhook/dependencies.d/package-queue
diff --git a/openshift/drupal-repository/files/etc/s6-overlay/s6-rc.d/webhook/run b/openshift/drupal-repository/files/etc/s6-overlay/s6-rc.d/webhook/run
@@ -0,0 +1,2 @@
+#!/command/with-contenv sh
+/usr/local/bin/webhook -verbose -hooks=/etc/webhook/hooks.json -template -hotreload -debug
diff --git a/openshift/drupal-repository/files/etc/s6-overlay/s6-rc.d/webhook/type b/openshift/drupal-repository/files/etc/s6-overlay/s6-rc.d/webhook/type
@@ -0,0 +1 @@
+longrun
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/command/with-contenv sh
		/usr/local/bin/webhook -verbose -hooks=/etc/webhook/hooks.json -template -hotreload -debug