Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use alpine 3.10 with glibc and bump remote docker in ciecleci #281

Merged
merged 2 commits into from
Aug 6, 2019
Merged

Use alpine 3.10 with glibc and bump remote docker in ciecleci #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9d5398
Bump remote docker in ciecleci
zhouzhuojie Aug 5, 2019
9cae90f
Use alpine 3.10 with glibc
zhouzhuojie Aug 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:
- checkout
- setup_remote_docker:
version: 18.06.0-ce
version: 18.09.3
docker_layer_caching: true
- run: cd integration_tests && make build-image
- run: cd integration_tests && make down
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ RUN make build
######################################
# Copy from builder to alpine image
######################################
FROM alpine:3.6
RUN apk add --no-cache libc6-compat ca-certificates curl
FROM frolvlad/alpine-glibc:alpine-3.10
RUN apk add --no-cache curl
WORKDIR /go/src/github.com/checkr/flagr
VOLUME ["/data"]

Expand Down
4 changes: 2 additions & 2 deletions integration_tests/Dockerfile-Integration-Test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ RUN make build
######################################
# Copy from builder to alpine image
######################################
FROM alpine:3.6
RUN apk add --no-cache libc6-compat ca-certificates curl
FROM frolvlad/alpine-glibc:alpine-3.10
RUN apk add --no-cache curl
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ca-certificates is already included in frolvlad/alpine-glibc

WORKDIR /go/src/github.com/checkr/flagr
COPY --from=go_builder /go/src/github.com/checkr/flagr/flagr ./flagr
VOLUME ["/data"]
Expand Down