Merge pull request #12 from dreamvo/feat/dockerCI

Fix Docker image build context in CI
dreamvo · Aug 15, 2020 · 01eb4c0 · 01eb4c0
2 parents 1f04f95 + 709c730
commit 01eb4c0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -15,4 +15,5 @@ jobs:
           name: dreamvo/gilfoyle
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+          context: .
           workdir: support/docker
diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile
@@ -8,6 +8,7 @@ LABEL maintainer="Sundowndev" \
   org.label-schema.schema-version="0.1"
 
 WORKDIR /app
+RUN apk add build-base
 COPY . .
 RUN go get -v -t -d ./...
 RUN go generate ./...

diff --git a/support/docker/docker-compose.dev.yml b/support/docker/docker-compose.dev.yml
@@ -4,8 +4,8 @@ services:
   gilfoyle:
     restart: on-failure
     build:
-      context: .
-      dockerfile: Dockerfile
+      context: ../../
+      dockerfile: support/docker/Dockerfile
     command:
       - "serve -p 3000"
     ports: