Skip to content

Commit 3ac0f26

Browse files
committed
CI/CD: Patch the companion's Dockerfile for tests
1 parent 3d35839 commit 3ac0f26

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ jobs:
2424
steps:
2525
- name: Checkout Code
2626
uses: actions/checkout@v2
27+
- name: Patch the Dockerfile's docker-gen
28+
run: |
29+
sed -i 's#DOCKER_GEN_VERSION=.*$#DOCKER_GEN_VERSION=fix-current-container-id#g' Dockerfile
30+
sed -i 's#go get github.com/jwilder/docker-gen#go get github.com/buchdag/docker-gen \&\& mv /go/src/github.com/buchdag /go/src/github.com/jwilder#g' Dockerfile
2731
- name: Build Image
2832
run: docker build -t "$IMAGE" .
2933
- name: Inspect Image

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM golang:1.15-alpine AS go-builder
22

3-
ENV DOCKER_GEN_VERSION=fix-current-container-id
3+
ENV DOCKER_GEN_VERSION=0.7.4
44

55
# Build docker-gen
66
RUN apk add --no-cache --virtual .build-deps \
@@ -9,8 +9,7 @@ RUN apk add --no-cache --virtual .build-deps \
99
git \
1010
make \
1111
musl-dev \
12-
&& go get github.com/buchdag/docker-gen \
13-
&& mv /go/src/github.com/buchdag /go/src/github.com/jwilder \
12+
&& go get github.com/jwilder/docker-gen \
1413
&& cd /go/src/github.com/jwilder/docker-gen \
1514
&& git -c advice.detachedHead=false checkout $DOCKER_GEN_VERSION \
1615
&& make get-deps \

0 commit comments

Comments
 (0)