Merge branch 'master' into dependabot/cargo/dependencies-ad2f36e187

m4tx · Jul 1, 2024 · 6839231 · 6839231
2 parents 33bb551 + 92529e2
commit 6839231
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -33,7 +33,7 @@ jobs:
           images: ${{ env.REGISTRY }}/m4tx/chombo-gen-backend
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: chombo-gen-backend.dockerfile
@@ -66,7 +66,7 @@ jobs:
           images: ${{ env.REGISTRY }}/m4tx/chombo-gen-frontend
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: chombo-gen-frontend.dockerfile
@@ -99,7 +99,7 @@ jobs:
           images: ${{ env.REGISTRY }}/m4tx/chombo-gen-proxy
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: chombo-gen-proxy.dockerfile

diff --git a/chombo-gen-backend.dockerfile b/chombo-gen-backend.dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.77 as builder
+FROM rust:1.79 as builder
 WORKDIR /usr/src/chombo-gen
 COPY . .
 WORKDIR /usr/src/chombo-gen/chombo-gen-backend

diff --git a/chombo-gen-frontend.dockerfile b/chombo-gen-frontend.dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.77 as builder
+FROM rust:1.79 as builder
 RUN rustup target add wasm32-unknown-unknown && \
      cargo install trunk
 WORKDIR /usr/src/chombo-gen
@@ -7,5 +7,5 @@ WORKDIR /usr/src/chombo-gen/chombo-gen-frontend
 ENV CHOMBO_GEN_API_URL=/api
 RUN trunk build --release
 
-FROM nginx:1.25
+FROM nginx:1.27
 COPY --from=builder /usr/src/chombo-gen/chombo-gen-frontend/dist /usr/share/nginx/html
diff --git a/chombo-gen-proxy.dockerfile b/chombo-gen-proxy.dockerfile
@@ -1,2 +1,2 @@
-FROM nginx:1.25
+FROM nginx:1.27
 COPY proxy/default.conf /etc/nginx/conf.d/default.conf