Merge pull request #248 from zhang-accounting/refact/move-docker-file…

…-into-folder Refact/move docker file into folder
zhang-accounting · Feb 29, 2024 · 851b759 · 851b759
2 parents bb0e298 + 5dfd69c
commit 851b759
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 57 deletions.
diff --git a/.github/workflows/snapshot-build.yml b/.github/workflows/snapshot-build.yml
@@ -5,8 +5,8 @@ on:
     branches:
       - main
 permissions:
-    id-token: write
-    pages: write
+  id-token: write
+  pages: write
 
 env:
   # Name of module and id separated by a slash
@@ -17,56 +17,6 @@ env:
   DOCKER_VERSION: 2.1.1479-p3869
 jobs:
   release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-
-      - name: frontend install
-        run: yarn install
-        working-directory: ./frontend
-
-      - name: frontend build
-        run: yarn run build
-        working-directory: ./frontend
-
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          platforms: linux/amd64
-          push: true
-          tags: |
-            kilerd/zhang:snapshot
-  example-build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -112,8 +62,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: Dockerfile-example
           platforms: linux/amd64
           push: true
           tags: |
-            kilerd/zhang:snapshot-example
+            kilerd/zhang:snapshot
diff --git a/docker/example-deployment/Dockerfile b/docker/example-deployment/Dockerfile
diff --git a/Dockerfile-example → docker/example/Dockerfile b/Dockerfile-example → docker/example/Dockerfile
@@ -28,4 +28,3 @@ WORKDIR application
 EXPOSE 8000
 
 ENTRYPOINT ["./zhang", "serve", "/data", "--port", "8000"]
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,3 @@ WORKDIR application
		EXPOSE 8000

		ENTRYPOINT ["./zhang", "serve", "/data", "--port", "8000"]