Fix docker files

iliafrenkel · Aug 20, 2021 · 918ed34 · 918ed34
1 parent 92da5f6
commit 918ed34
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -41,7 +41,8 @@ dockers:
     dockerfile: Dockerfile.release
     use: docker
     extra_files:
-      - src
+      - assets
+      - templates
     build_flag_templates:
     - "--label=org.opencontainers.image.created={{.Date}}"
     - "--label=org.opencontainers.image.title={{.ProjectName}}"
@@ -53,10 +54,10 @@ archives:
     files:
       - LICENSE.txt
       - README.md
-      - src: ./src/web/assets
+      - src: ./assets
         dst: assets
         strip_parent: true
-      - src: ./src/web/templates
+      - src: ./templates
         dst: templates
         strip_parent: true
     format_overrides:

diff --git a/Dockerfile.build b/Dockerfile.build
@@ -10,8 +10,8 @@ RUN make clean && make build
 FROM scratch
 
 COPY --from=build /build/build/go-pb /go-pb
-COPY --from=build /build/src/web/assets /assets
-COPY --from=build /build/src/web/templates /templates
+COPY --from=build /build/assets /assets
+COPY --from=build /build/templates /templates
 
 WORKDIR /
 ENTRYPOINT ["/go-pb"]
diff --git a/Dockerfile.release b/Dockerfile.release
@@ -1,8 +1,8 @@
 FROM scratch
 
 ADD ./go-pb /go-pb
-ADD ./src/web/assets /assets
-ADD ./src/web/templates /templates
+ADD ./assets /assets
+ADD ./templates /templates
 
 WORKDIR /
 ENTRYPOINT ["/go-pb"]
diff --git a/scripts/start_docker.ps1 b/scripts/start_docker.ps1
@@ -0,0 +1 @@
+docker run --rm --env-file .env -e GOPB_WEB_HOST=0.0.0.0 -e GOPB_WEB_LOG_MODE=debug -v "${PWD}/.tmp:/.tmp" --network go-pb_go-pb_dev -p 8080:8080 -p 8084:8084 iliaf/go-pb:latest
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		docker run --rm --env-file .env -e GOPB_WEB_HOST=0.0.0.0 -e GOPB_WEB_LOG_MODE=debug -v "${PWD}/.tmp:/.tmp" --network go-pb_go-pb_dev -p 8080:8080 -p 8084:8084 iliaf/go-pb:latest