From d3c0220100ff4906e8a19ffc4847def1b8de912a Mon Sep 17 00:00:00 2001 From: shrukan <29954021+sailorbob134280@users.noreply.github.com> Date: Mon, 26 Dec 2022 17:36:50 -0800 Subject: [PATCH] Removed unnecessary git dep in docker image --- .devcontainer/devcontainer.json | 4 ++-- Dockerfile | 2 +- README.md | 1 - ci/build-and-test.yml | 7 ++++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3b7dc7b..ab8ea9f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -15,8 +15,8 @@ // Use 'forwardPorts' to make a list of ports inside the container available locally. // "forwardPorts": [], - // Uncomment the next line to run commands after the container is created. - // "postCreateCommand": "cat /etc/os-release", + // The basic image doesn't have or need git, but we do to work in it + "postCreateCommand": "apt-get install -y git", // Configure tool-specific properties. "customizations": { diff --git a/Dockerfile b/Dockerfile index 1e28580..25227ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM gcc:12 # Install build tools -RUN apt-get update && apt-get install -y python3 ninja-build python3-pip gdb graphviz git +RUN apt-get update && apt-get install -y python3 python3-pip ninja-build gdb graphviz RUN pip install meson gcovr # The version of doxy in the Debian repos is too old to support concepts, so we grab the latest release and manually install RUN wget --progress=bar:force:noscroll https://www.doxygen.nl/files/doxygen-1.9.5.linux.bin.tar.gz && \ diff --git a/README.md b/README.md index 3fc52ef..aa02edf 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # ${REPO_NAME_PASCAL} -![CI](https://concourse.shrukanslab.xyz/api/v1/teams/sl-devs/pipelines/${REPO_NAME_KEBAB}/badge) ![CI](https://concourse.shrukanslab.xyz/api/v1/teams/sl-devs/pipelines/cpp-template/badge) ${REPO_DESCRIPTION} \ No newline at end of file diff --git a/ci/build-and-test.yml b/ci/build-and-test.yml index 4b4c7ed..85df50a 100644 --- a/ci/build-and-test.yml +++ b/ci/build-and-test.yml @@ -14,7 +14,7 @@ resources: username: ((gitea.username)) password: ((gitea.password)) -- name: image-out +- name: dev-image type: registry-image icon: docker source: @@ -91,9 +91,10 @@ jobs: outputs: - name: image params: - CONTEXT: image-repo + CONTEXT: cpp-src run: path: build - - put: image-out + + - put: dev-image params: image: image/image.tar \ No newline at end of file