Skip to content

Commit

Permalink
Keep the container image minimal (#557)
Browse files Browse the repository at this point in the history
* Keep the container image minimal

* Review comment: Changing Integration test dockerfile

* Fix test with Entrypoint
  • Loading branch information
sks authored Nov 7, 2023
1 parent decc484 commit fcc74ae
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
7 changes: 6 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ RUN apk add --no-cache git make build-base
ADD . .
RUN make build

FROM alpine

COPY --from=go_builder /go/src/github.com/openflagr/flagr/flagr .

ENV HOST=0.0.0.0
ENV PORT=18000
ENV FLAGR_DB_DBDRIVER=sqlite3
Expand All @@ -32,4 +36,5 @@ USER appuser
ADD --chown=appuser:appgroup ./buildscripts/demo_sqlite3.db /data/demo_sqlite3.db

EXPOSE 18000
CMD ./flagr

CMD "./flagr"
7 changes: 6 additions & 1 deletion integration_tests/Dockerfile-Integration-Test
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@ RUN apk add --no-cache git make build-base
ADD . .
RUN make build

FROM alpine

COPY --from=go_builder /go/src/github.com/openflagr/flagr/flagr .

ENV HOST=0.0.0.0
ENV PORT=18000
ENV FLAGR_DB_DBDRIVER=sqlite3
ENV FLAGR_RECORDER_ENABLED=false
RUN addgroup -S appgroup && adduser -S appuser -G appgroup
USER appuser
EXPOSE 18000
CMD ./flagr

CMD "./flagr"
4 changes: 2 additions & 2 deletions integration_tests/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ version: "3.6"

networks:
default:
external:
name: flagr_integration_tests
external: true
name: flagr_integration_tests

services:
mysql:
Expand Down

0 comments on commit fcc74ae

Please sign in to comment.