Docker work (#1)

* Change dockerfile location * Formatting * Only build on main
CarletonComputerScienceSociety · Sep 15, 2021 · 2c43c86 · 2c43c86
1 parent 95853f6
commit 2c43c86
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -2,8 +2,8 @@ name: Build Docker image
 
 on:
   push:
-    # branches:
-    #   - 'master'
+    branches:
+      - 'main'
 
 jobs:
   docker:
@@ -25,6 +25,5 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: docker/Dockerfile.prod
           push: true
           tags: ghcr.io/carletoncomputersciencesociety/friendzoner/friendzoner-rust:latest
diff --git a/Dockerfile b/Dockerfile
@@ -10,4 +10,4 @@ FROM debian:buster-slim
 
 COPY --from=builder /app/target/release/friend-zoner /app/friend-zoner
 
-ENTRYPOINT ["/app/friend-zoner"]
+ENTRYPOINT ["/app/friend-zoner"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,4 @@ FROM debian:buster-slim

		COPY --from=builder /app/target/release/friend-zoner /app/friend-zoner

		ENTRYPOINT ["/app/friend-zoner"]
		ENTRYPOINT ["/app/friend-zoner"]