Move Nchan image to organization (#217)

Pin Nchan to version 1.3 #209. Additionally: * Move app image to parent directory.
marein · Feb 7, 2024 · df5de27 · df5de27
1 parent 47152e1
commit df5de27
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 132 deletions.
diff --git a/deploy/single-server/docker-compose.yml b/deploy/single-server/docker-compose.yml
@@ -132,12 +132,14 @@ services:
             - "prometheus-path=/metrics/per-object"
         restart: on-failure
     nchan:
-        image: marein/php-gaming-website:nchan
+        image: ghcr.io/gaming-platform/docker-nchan:1.3
         restart: on-failure
         labels:
             - "traefik.enable=true"
             - "traefik.http.routers.nchan.priority=20"
             - "traefik.http.routers.nchan.rule=PathPrefix(`/sse`)"
+            - "traefik.http.routers.nchan.middlewares=nchan-stripprefix"
+            - "traefik.http.middlewares.nchan-stripprefix.stripprefix.prefixes=/sse"
             - "prometheus-job=nchan"
             - "prometheus-port=81"
     web-interface-http:

diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
@@ -73,12 +73,14 @@ services:
             - rabbitmq:/var/lib/rabbitmq/mnesia
         restart: on-failure
     nchan:
-        image: marein/php-gaming-website:nchan
+        image: ghcr.io/gaming-platform/docker-nchan:1.3
         restart: on-failure
         labels:
             - "traefik.enable=true"
             - "traefik.http.routers.nchan.priority=20"
             - "traefik.http.routers.nchan.rule=PathPrefix(`/sse`)"
+            - "traefik.http.routers.nchan.middlewares=nchan-stripprefix"
+            - "traefik.http.middlewares.nchan-stripprefix.stripprefix.prefixes=/sse"
     php-fpm:
         <<: *php-container
         labels:
@@ -118,7 +120,7 @@ services:
     php:
         build:
             context: .
-            dockerfile: ./docker/php-fpm/Dockerfile
+            dockerfile: ./docker/Dockerfile
         entrypoint: ''
         command: 'true'
         volumes:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,7 +14,7 @@ x-php-container:
     <<: *php-container-volumes
     build:
         context: .
-        dockerfile: ./docker/php-fpm/Dockerfile
+        dockerfile: ./docker/Dockerfile
     env_file: ./.env
     depends_on:
         - mysql
@@ -125,14 +125,14 @@ services:
             - "prometheus-path=/metrics/per-object"
         restart: on-failure
     nchan:
-        build:
-            context: .
-            dockerfile: ./docker/nchan/Dockerfile
+        image: ghcr.io/gaming-platform/docker-nchan:1.3
         restart: on-failure
         labels:
             - "traefik.enable=true"
             - "traefik.http.routers.nchan.priority=20"
             - "traefik.http.routers.nchan.rule=PathPrefix(`/sse`)"
+            - "traefik.http.routers.nchan.middlewares=nchan-stripprefix"
+            - "traefik.http.middlewares.nchan-stripprefix.stripprefix.prefixes=/sse"
             - "prometheus-job=nchan"
             - "prometheus-port=81"
     php-fpm:
@@ -169,7 +169,7 @@ services:
         <<: *php-container-volumes
         build:
             context: .
-            dockerfile: ./docker/php-fpm/Dockerfile
+            dockerfile: ./docker/Dockerfile
         entrypoint: ''
         command: 'true'
     phpmyadmin:

diff --git a/docker/php-fpm/Dockerfile → docker/Dockerfile b/docker/php-fpm/Dockerfile → docker/Dockerfile
@@ -9,7 +9,7 @@ ARG environment=development
 
 WORKDIR /project
 
-COPY /docker/php-fpm/composer-install.sh /docker/php-fpm/composer-install-after-code-copy.sh /
+COPY /docker/composer-install.sh /docker/composer-install-after-code-copy.sh /
 COPY /composer.json /composer.lock /project/
 RUN /composer-install.sh
 
@@ -25,13 +25,13 @@ ARG environment=development
 
 WORKDIR /project
 
-COPY /docker/php-fpm/entrypoint.sh /docker/php-fpm/warmup.sh /
+COPY /docker/entrypoint.sh /docker/warmup.sh /
 
 COPY --from=builder /project /project
 
 RUN /warmup.sh
 
-COPY /docker/php-fpm/${environment}.ini /etc/php/8.3/fpm/conf.d/
+COPY /docker/${environment}.ini /etc/php/8.3/fpm/conf.d/
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["php-http"]
diff --git a/...p-fpm/composer-install-after-code-copy.sh → docker/composer-install-after-code-copy.sh b/...p-fpm/composer-install-after-code-copy.sh → docker/composer-install-after-code-copy.sh
diff --git a/docker/php-fpm/composer-install.sh → docker/composer-install.sh b/docker/php-fpm/composer-install.sh → docker/composer-install.sh
diff --git a/docker/php-fpm/development.ini → docker/development.ini b/docker/php-fpm/development.ini → docker/development.ini
diff --git a/docker/php-fpm/entrypoint.sh → docker/entrypoint.sh b/docker/php-fpm/entrypoint.sh → docker/entrypoint.sh
diff --git a/docker/nchan/Dockerfile b/docker/nchan/Dockerfile
diff --git a/docker/nchan/default.conf b/docker/nchan/default.conf
diff --git a/docker/nchan/entrypoint.sh b/docker/nchan/entrypoint.sh
diff --git a/docker/php-fpm/production.ini → docker/production.ini b/docker/php-fpm/production.ini → docker/production.ini
diff --git a/docker/php-fpm/warmup.sh → docker/warmup.sh b/docker/php-fpm/warmup.sh → docker/warmup.sh
diff --git a/project b/project
@@ -94,15 +94,13 @@ acceptance() {
 }
 
 buildProductionImages() {
-    docker build --build-arg environment=production --file docker/php-fpm/Dockerfile --tag marein/php-gaming-website:php-fpm .
-    docker build --file docker/nchan/Dockerfile --tag marein/php-gaming-website:nchan .
+    docker build --build-arg environment=production --file docker/Dockerfile --tag marein/php-gaming-website:php-fpm .
 }
 
 pushProductionImages() {
     echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 
     docker push marein/php-gaming-website:php-fpm
-    docker push marein/php-gaming-website:nchan
 }
 
 if [ "$*" = "" ]