docker build with envs (#186)

core-coin · Sep 1, 2020 · 4d2ecb9 · 4d2ecb9
1 parent 2b59706
commit 4d2ecb9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,6 +33,6 @@ jobs:
     - name: docker login
       run: docker login docker.pkg.github.com -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }}
     - name: docker build
-      run: docker build . -f Dockerfile -e NETWORK=devin DATADIR=~/.devin -t docker.pkg.github.com/core-coin/go-core/gocore:${{steps.vars.outputs.tag}} -t docker.pkg.github.com/core-coin/go-core/gocore:latest
+      run: docker build . -f Dockerfile -t docker.pkg.github.com/core-coin/go-core/gocore:${{steps.vars.outputs.tag}} -t docker.pkg.github.com/core-coin/go-core/gocore:latest
     - name: docker push
       run: docker push docker.pkg.github.com/core-coin/go-core/gocore
diff --git a/Dockerfile b/Dockerfile
@@ -4,11 +4,7 @@ ARG ALLTOOLS
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 
 ADD . /go-core
-RUN if [[ -n "$ALLTOOLS" ]] ; then \
-      cd /go-core && make all \
-    else \
-      cd /go-core && make gocore \
-    fi
+RUN if [[ -n "$ALLTOOLS" ]] ; then cd /go-core && make all ; else cd /go-core && make gocore ; fi
 
 # Pull Gocore into a second stage deploy alpine container
 FROM alpine:latest
@@ -27,4 +23,4 @@ RUN apk add --no-cache ca-certificates
 COPY --from=builder /go-core/build/bin/* /usr/local/bin/
 
 EXPOSE 30300 30300/udp
-ENTRYPOINT ["gocore", "--datadir=${DATADIR}", "--keystore=${KEYDIR}", "--${NETWORK}", "--nat", "auto", "--syncmode=${SYNCMODE}", "--gcmode=${GCMODE}"]
+ENTRYPOINT gocore --datadir=${DATADIR} --keystore=${KEYDIR} --${NETWORK} --syncmode=${SYNCMODE} --gcmode=${GCMODE}