Skip to content

feat: add git to Docker image #6034

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

Merged
merged 11 commits into from
Feb 6, 2023
Merged

feat: add git to Docker image #6034

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dde5e95
feat: add git to Docker image
deansheather Feb 4, 2023
c334e5f
disable protections on github workflows for testing
deansheather Feb 4, 2023
f997a2f
fix workflow file
deansheather Feb 4, 2023
5891361
update rcodesign
deansheather Feb 4, 2023
c68fbb1
fixup! update rcodesign
deansheather Feb 4, 2023
be1985a
fix workflow file
deansheather Feb 4, 2023
94a2619
fixup! fix workflow file
deansheather Feb 5, 2023
c382c15
fixup! fix workflow file
deansheather Feb 5, 2023
d65f782
restore protections to workflow file
deansheather Feb 5, 2023
d56e27b
fixup! restore protections to workflow file
deansheather Feb 5, 2023
8d22999
pr comments
deansheather Feb 6, 2023
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
Prev Previous commit
Next Next commit
fixup! fix workflow file
  • Loading branch information
@deansheather
deansheather committed Feb 5, 2023
commit 94a2619b6de0bda0601d2a875f6de942a49f0d35
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ jobs:
$(cat build/coder_"$version"_linux_{amd64,arm64,armv7}.tag)
fi
env:
CODER_IMAGE_BUILD_BASE_TAG: ${{ steps.image-base-tag.outputs.tag }}
CODER_BASE_IMAGE_TAG: ${{ steps.image-base-tag.outputs.tag }}

- name: ls build
run: ls -lh build
Expand Down
4 changes: 3 additions & 1 deletion scripts/build_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
# value is the tag to use for the built image (not pushed). This also consumes
# $CODER_IMAGE_BUILD_BASE_TAG for easily forcing a fresh build in CI.
#
# The default base image can be controlled via $CODER_BASE_IMAGE_TAG.
#
# The image will be built and tagged against the image tag returned by
# ./image_tag.sh unless a --target parameter is supplied.
#
Expand All @@ -27,7 +29,7 @@ set -euxo pipefail
# shellcheck source=scripts/lib.sh
source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"

DEFAULT_BASE="ghcr.io/coder/coder-base:latest"
DEFAULT_BASE="${CODER_BASE_IMAGE_TAG:-ghcr.io/coder/coder-base:latest}"

arch=""
image_tag=""
Expand Down