Merge pull request #1 from genofire/main

migrate to mollyim-org
mollyim · Oct 30, 2023 · 64eab4c · 64eab4c
2 parents fce5282 + 6068a9f
commit 64eab4c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
@@ -19,11 +19,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           # list of Docker images to use as base name for tags
           images: |
@@ -35,22 +35,26 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
+    
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           push: ${{ github.event_name != 'pull_request' }}
           file: Containerfile
+          platforms: linux/amd64,linux/arm64/v8,linux/arm/v7
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Containerfile b/Containerfile
@@ -1,15 +1,15 @@
-FROM docker.io/rust:buster as builder
+FROM docker.io/rust:bookworm as builder
 WORKDIR app
 
 COPY . .
 RUN cargo build --release --bin mollysocket
 
 
-FROM docker.io/debian:buster as runtime
+FROM docker.io/debian:bookworm as runtime
 WORKDIR app
 
 RUN apt update && \
-    apt install -y openssl libssl-dev ca-certificates libssl1.1 libsqlite3-0
+    apt install -y libssl3 libsqlite3-0 ca-certificates
 
 
 COPY --from=builder /app/target/release/mollysocket /usr/local/bin/