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

fix(docker): add docker to the image so ggshield secret scan docker works #926

Closed
wants to merge 1 commit into from
Closed

fix(docker): add docker to the image so ggshield secret scan docker works #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Keep image in sync with scripts/update-pipfile-lock/Dockerfile
FROM python:3.10-slim as build

LABEL maintainer="GitGuardian SRE Team <[email protected]>"
LABEL maintainer="GitGuardian <[email protected]>"

ENV LC_ALL C.UTF-8
ENV LANG C.UTF-8
Expand All @@ -15,9 +15,10 @@ WORKDIR /app
RUN \
apt-get update \
&& apt-get dist-upgrade -y --no-install-recommends \
&& apt-get install -y --no-install-recommends git openssh-client \
&& apt-get install -y --no-install-recommends git openssh-client ca-certificates curl gnupg \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/*\
&& curl -fsSL https://get.docker.com | sh
Copy link
Collaborator

Choose a reason for hiding this comment

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

I am not fond of blindly pulling from get.docker.com. Since we only use docker pull and docker save, would it be enough to get the distro version instead?


RUN pip3 install pipenv==2023.12.1

Expand Down
3 changes: 3 additions & 0 deletions changelog.d/20240628_101407_fnareoh_add_docker_to_docker_image.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### Fixed

- The docker image now has docker installed, so `ggshield secret scan docker` can work properly.
Loading