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

Make sure the Docker image has the git version in it #3715

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make sure the Docker image has the git version in it #3715

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
1 change: 0 additions & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ frontend/dist
tools/syn2mas/**
docs/
.devcontainer/
.git/
.github/
.gitignore
Dockerfile
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,7 @@ RUN --network=default \
--package mas-cli

# Build the rest
COPY ./Cargo.toml ./Cargo.lock /app/
COPY ./crates /app/crates
COPY ./ /app
ENV SQLX_OFFLINE=true
# Network access: cargo auditable needs it
RUN --network=default \
Expand Down
6 changes: 6 additions & 0 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ target "docker-metadata-action-syn2mas" {}
// This sets the platforms and is further extended by GitHub Actions to set the
// output and the cache locations
target "base" {
args = {
// This is set so that when we use a git context, the .git directory is
// present, as we infer the version at build time out of it
BUILDKIT_CONTEXT_KEEP_GIT_DIR = 1
}

platforms = [
"linux/amd64",
"linux/arm64",
Expand Down
Loading