From 4b5ba4f4e5c88c4f223bbea8c853aaf43df491fa Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 19:07:03 +0200 Subject: [PATCH 01/53] update common tools --- .chezmoidata.toml | 1 + .devcontainer/Dockerfile | 20 +- README.md | 4 +- images/commons-golang/Dockerfile | 39 ++- images/commons/Dockerfile | 47 ++-- images/commons/files/python-env-basement.txt | 7 - images/devops/Dockerfile | 271 ++----------------- images/devops/files/.tool-versions | 1 + images/devops/files/.zshrc | 39 +++ 9 files changed, 111 insertions(+), 318 deletions(-) create mode 100644 .chezmoidata.toml delete mode 100644 images/commons/files/python-env-basement.txt create mode 100644 images/devops/files/.tool-versions create mode 100644 images/devops/files/.zshrc diff --git a/.chezmoidata.toml b/.chezmoidata.toml new file mode 100644 index 0000000..f004966 --- /dev/null +++ b/.chezmoidata.toml @@ -0,0 +1 @@ +fofa = das diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 44992a0..0222863 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,13 +1,13 @@ FROM docker.pkg.github.com/nolte/vscode-devcontainers/devops:latest -RUN mkdir -p ${WORKON_HOME} \ - && virtualenv -p python3 ${WORKON_HOME}/development \ - && source ${WORKON_HOME}/development/bin/activate \ - && pip install pytest autopep8 pylint jsbeautifier tox \ - && deactivate +# RUN mkdir -p ${WORKON_HOME} \ +# && virtualenv -p python3 ${WORKON_HOME}/development \ +# && source ${WORKON_HOME}/development/bin/activate \ +# && pip install pytest autopep8 pylint jsbeautifier tox \ +# && deactivate -RUN mkdir -p ${WORKON_HOME} \ - && virtualenv -p python3 ${WORKON_HOME}/cookiecutter \ - && source ${WORKON_HOME}/cookiecutter/bin/activate \ - && pip install cookiecutter jinja2-ansible-filters pytest-cookies json-diff autopep8 pylint jsbeautifier \ - && deactivate +# RUN mkdir -p ${WORKON_HOME} \ +# && virtualenv -p python3 ${WORKON_HOME}/cookiecutter \ +# && source ${WORKON_HOME}/cookiecutter/bin/activate \ +# && pip install cookiecutter jinja2-ansible-filters pytest-cookies json-diff autopep8 pylint jsbeautifier \ +# && deactivate diff --git a/README.md b/README.md index 11c7be4..f775cd8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # Visual Studo Code DevContainers -The Containers are tested with Docker ``19.03.8`` and based on [qdm12/basedevcontainer](https://github.com/qdm12/basedevcontainer). +A standardised development environment is necessary for working on a wide range of projects, even after a certain period of time has elapsed. + +So we create a set of pre configured [Dev Containers](https://code.visualstudio.com/docs/remote/containers) based on [qdm12/basedevcontainer](https://github.com/qdm12/basedevcontainer). ## Usage diff --git a/images/commons-golang/Dockerfile b/images/commons-golang/Dockerfile index 8185faf..cdf744f 100644 --- a/images/commons-golang/Dockerfile +++ b/images/commons-golang/Dockerfile @@ -1,21 +1,21 @@ ARG FROM_REGISTRY=docker.pkg.github.com/nolte/vscode-devcontainers ARG FROM_IMAGE_NAME=commons ARG FROM_IMAGE_VERSION=latest -ARG ALPINE_VERSION=3.11 -ARG GO_VERSION=1.14 +ARG ALPINE_VERSION=3.17 +ARG GO_VERSION=1.20 # See https://github.com/golang/go/issues/14481 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS race -WORKDIR /tmp/race -RUN apk --update -q --progress --no-cache add git g++ -RUN git clone --single-branch https://github.com/llvm-mirror/compiler-rt . && \ - git reset --hard 69445f095c22aac2388f939bedebf224a6efcdaf -RUN wget -q https://github.com/golang/go/files/4114545/0001-upstream-master-69445f095-hack-to-make-Go-s-race-flag-work-on-Alpine.patch.gz -O patch.gz && \ - gunzip patch.gz && \ - patch -p1 -i patch -WORKDIR /tmp/race/lib/tsan/go -RUN sed -e 's,-Wno-unknown-warning-option,-Wno-error=deprecated,' -i buildgo.sh -RUN ./buildgo.sh +#WORKDIR /tmp/race +#RUN apk --update -q --progress --no-cache add git g++ +#RUN git clone --single-branch https://github.com/llvm-mirror/compiler-rt . && \ +# git reset --hard 69445f095c22aac2388f939bedebf224a6efcdaf +#RUN wget -q https://github.com/golang/go/files/4114545/0001-upstream-master-69445f095-hack-to-make-Go-s-race-flag-work-on-Alpine.patch.gz -O patch.gz && \ +# gunzip patch.gz && \ +# patch -p1 -i patch +#WORKDIR /tmp/race/lib/tsan/go +#RUN sed -e 's,-Wno-unknown-warning-option,-Wno-error=deprecated,' -i buildgo.sh +#RUN ./buildgo.sh FROM ${FROM_REGISTRY}/${FROM_IMAGE_NAME}:${FROM_IMAGE_VERSION} @@ -38,7 +38,7 @@ LABEL \ USER root # TODO use build args COPY --from=race /usr/local/go /usr/local/go -COPY --from=race /tmp/race/lib/tsan/go/race_linux_amd64.syso /usr/local/go/src/runtime/race/race_linux_amd64.syso +# COPY --from=race /tmp/race/lib/tsan/go/race_linux_amd64.syso /usr/local/go/src/runtime/race/race_linux_amd64.syso ENV GOPATH=/go ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH \ CGO_ENABLED=0 \ @@ -52,13 +52,12 @@ COPY --chown=${USER_UID}:${USER_GID} files/.zshrc-specific files/.welcome.sh /ho COPY files/.zshrc-specific files/.welcome.sh /root/ # install common go tool sets -RUN go get -v \ - github.com/magefile/mage \ - github.com/evanphx/json-patch/cmd/json-patch \ - 2>&1 && \ - rm -rf $GOPATH/pkg/* $GOPATH/src/* /root/.cache/go-build && \ - chown -R ${USER_UID}:${USER_GID} $GOPATH && \ - chmod -R 700 $GOPATH +#RUN go install -v \ +# github.com/magefile/mage@latest \ +# 2>&1 && \ +# rm -rf $GOPATH/pkg/* $GOPATH/src/* /root/.cache/go-build && \ +# chown -R ${USER_UID}:${USER_GID} $GOPATH && \ +# chmod -R 700 $GOPATH RUN mkdir -p /go/src && chown -R ${USER_UID}:${USER_GID} /go/src \ diff --git a/images/commons/Dockerfile b/images/commons/Dockerfile index aed9a5e..b0f5b10 100644 --- a/images/commons/Dockerfile +++ b/images/commons/Dockerfile @@ -1,5 +1,5 @@ -FROM qmcgaw/basedevcontainer:alpine +FROM qmcgaw/basedevcontainer:v0.24.0-alpine ENV USERNAME=vscode ENV USER_UID=1000 @@ -7,9 +7,12 @@ ENV USER_GID=1000 ENV WORKON_HOME=/home/${USERNAME}/.virtualenvs # https://github.com/cli/cli/releases/ -ENV GH_CLI_VERSION=0.8.0 +ENV GH_CLI_VERSION=2.23.0 -USER root +RUN id + +RUN addgroup -g ${USER_GID} ${USERNAME} \ + && adduser -D ${USERNAME} --uid ${USER_UID} --ingroup ${USERNAME} # Adding fonts @@ -29,11 +32,19 @@ ENV PYTHONUNBUFFERED=1 RUN echo "**** install Python ****" && \ apk add --update-cache \ curl wget \ + zlib-dev \ boost-regex \ sed \ jq tar rsync unzip tree vim \ bash \ zip \ + tar \ + xz \ + xz-dev \ + sqlite \ + sqlite-dev \ + ncurses-dev \ + readline-dev \ libc6-compat python3 build-base python3-dev libffi libffi-dev openssl-dev \ linux-headers gnupg openssl gcc build-base libc-dev musl-dev ca-certificates \ && rm -rf /var/cache/apk/* && \ @@ -45,37 +56,21 @@ RUN echo "**** install Python ****" && \ pip3 install --no-cache --upgrade pip setuptools wheel virtualenvwrapper virtualenv && \ if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi - -RUN mkdir -p /opt/pass && \ - wget https://git.zx2c4.com/password-store/snapshot/password-store-1.7.3.tar.xz -O /tmp/password-store.tar.xz && \ - tar -xf /tmp/password-store.tar.xz -C /opt/pass && \ - ln -s /opt/pass/password-store-1.7.3 /opt/pass/current && \ - cd /opt/pass/current/ && \ - make install - RUN mkdir -p /home/$USERNAME/.vscode-server/extensions \ /home/$USERNAME/.vscode-server-insiders/extensions \ && chown -R $USERNAME \ /home/$USERNAME/.vscode-server \ /home/$USERNAME/.vscode-server-insiders -RUN curl -Lo ./gh.tar.gz https://github.com/cli/cli/releases/download/v${GH_CLI_VERSION}/gh_${GH_CLI_VERSION}_linux_amd64.tar.gz \ - && tar -zxf ./gh.tar.gz \ - && mv ./gh_${GH_CLI_VERSION}_linux_amd64/bin/gh /usr/local/bin/gh \ - && chmod +x /usr/local/bin/gh \ - && rm ./gh.tar.gz \ - && rm -rf ./gh_${GH_CLI_VERSION}_linux_amd64 +# RUN curl -Lo ./gh.tar.gz https://github.com/cli/cli/releases/download/v${GH_CLI_VERSION}/gh_${GH_CLI_VERSION}_linux_amd64.tar.gz \ +# && tar -zxf ./gh.tar.gz \ +# && mv ./gh_${GH_CLI_VERSION}_linux_amd64/bin/gh /usr/local/bin/gh \ +# && chmod +x /usr/local/bin/gh \ +# && rm ./gh.tar.gz \ +# && rm -rf ./gh_${GH_CLI_VERSION}_linux_amd64 USER ${USERNAME} - -COPY --chown=${USER_UID}:${USER_GID} files/python-env-basement.txt /home/${USERNAME}/vens/python-env-basement.txt - - -RUN mkdir -p ${WORKON_HOME} \ - && virtualenv -p python3 ${WORKON_HOME}/development \ - && source ${WORKON_HOME}/development/bin/activate \ - && pip install -r /home/${USERNAME}/vens/python-env-basement.txt \ - && deactivate +RUN git clone --single-branch --depth 1 https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh COPY --chown=${USER_UID}:${USER_GID} files/.zshrc-specific files/.welcome.sh /home/${USERNAME}/ RUN touch /home/${USERNAME}/.zshrc-specific.sh \ No newline at end of file diff --git a/images/commons/files/python-env-basement.txt b/images/commons/files/python-env-basement.txt deleted file mode 100644 index 5d7f66f..0000000 --- a/images/commons/files/python-env-basement.txt +++ /dev/null @@ -1,7 +0,0 @@ -pre-commit -python-gilt -mkdocs -yamllint -yamale -cookiecutter -jinja2-ansible-filters diff --git a/images/devops/Dockerfile b/images/devops/Dockerfile index 854b707..e359635 100644 --- a/images/devops/Dockerfile +++ b/images/devops/Dockerfile @@ -1,268 +1,31 @@ ARG FROM_REGISTRY=docker.pkg.github.com/nolte/vscode-devcontainers -ARG FROM_IMAGE_NAME=commons-golang +ARG FROM_IMAGE_NAME=commons #ARG FROM_IMAGE_NAME=golang ARG FROM_IMAGE_VERSION=latest -FROM ${FROM_REGISTRY}/${FROM_IMAGE_NAME}:${FROM_IMAGE_VERSION} - -#ARG USERNAME=vscode -#ARG USER_UID=1000 -#ARG USER_GID=1000 - -USER root - -# https://github.com/helm/helm/releases -ENV HELM_VERSION=v3.3.4 - -# https://github.com/kubernetes-sigs/kind/releases -ENV KIND_VERSION=v0.9.0 - -# https://github.com/helm/chart-testing/releases -ENV HELM_CHART_TESTING_VERSION=3.1.1 - -# https://github.com/helm/chart-releaser -ENV HELM_CHART_RELEASER_VERSION=1.0.0 - -# https://github.com/docker/buildx/releases -ENV DOCKERX_VERSION=v0.4.2 - -# https://github.com/hashicorp/terraform/releases -ENV TERRAFORM_VERSION=0.13.3 - -# https://github.com/bats-core/bats-core/releases -ENV BATS_VERSION=1.2.1 - -# https://github.com/mikefarah/yq/releases -ENV YQ_VERSION=3.4.0 - -# https://github.com/hashicorp/vault/releases -ENV VAULT_VERSION=1.5.4 - -## https://github.com/gavinbunney/terraform-provider-kubectl/releases -#ENV TERRAFORM_KUBECTL_PROVIDER_VERSION=v1.5.1 -# -## https://github.com/aminueza/terraform-provider-minio/releases -#ENV TERRAFORM_MINIO_PROVIDER_VERSION=1.1.0 -# -## https://github.com/mrparkers/terraform-provider-keycloak/releases -#ENV TERRAFORM_KEYCLOAK_PROVIDER_VERSION=1.20.0 -# -## https://github.com/nolte/terraform-provider-harbor/releases -#ENV TERRAFORM_HARBOR_PROVIDER_VERSION=0.1.5 - -# https://github.com/camptocamp/terraform-provider-pass/releases -#ENV TERRAFORM_PASS_PROVIDER_VERSION=v1.3.0 - -# https://github.com/go-swagger/go-swagger/releases -ENV SWAGGER_VERSION=v0.25.0 - -# https://github.com/terraform-docs/terraform-docs/releases -ENV TERRAFORM_DOC_VERSION=v0.10.0 - -# https://github.com/cli/cli/releases -ENV GITHUB_CLI_VERSION=1.0.0 - -# https://github.com/tektoncd/cli/releases -ENV TEKTONCD_CLI_VERSION=0.12.1 - -# https://github.com/kubernetes-sigs/kustomize/releases -ENV KUSTOMIZE_VERSION=3.8.4 - -# https://github.com/hashicorp/packer/releases -ARG PACKER_VERSION=1.6.3 - - -RUN apk add --update-cache \ - ncurses \ - nodejs npm \ - && rm -rf /var/cache/apk/* - -RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl \ - && chmod +x ./kubectl \ - && mv ./kubectl /usr/local/bin/kubectl - -RUN curl -Lo ./helm.tar.gz https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz \ - && tar -zxvf ./helm.tar.gz \ - && mv ./linux-amd64/helm /usr/local/bin/helm \ - && chmod +x /usr/local/bin/helm \ - && rm ./helm.tar.gz \ - && rm -rf ./linux-amd64 - -RUN curl -Lo ./terraform.zip https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \ - && unzip ./terraform.zip \ - && mv ./terraform /usr/local/bin/terraform \ - && chmod +x /usr/local/bin/terraform \ - && rm ./terraform.zip - -RUN curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-$(uname)-amd64 \ - && chmod +x ./kind \ - && mv ./kind /usr/local/bin/kind - -RUN curl -Lo /usr/local/bin/kubetail https://raw.githubusercontent.com/johanhaleby/kubetail/master/kubetail \ - && chmod +x /usr/local/bin/kubetail - -RUN curl -sSL -k https://github.com/bats-core/bats-core/archive/v${BATS_VERSION}.tar.gz -o /tmp/bats.tgz \ - && tar -zxf /tmp/bats.tgz -C /tmp \ - && /bin/bash /tmp/bats-core-${BATS_VERSION}/install.sh /usr/local - -RUN curl -Lo /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 \ - && chmod +x /usr/local/bin/yq - -RUN curl -Lo ./vault.zip https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip \ - && unzip ./vault.zip \ - && mv ./vault /usr/local/bin/vault \ - && chmod +x /usr/local/bin/vault \ - && rm ./vault.zip - -# minio admin tools -RUN curl -Lo /usr/local/bin/mc https://dl.min.io/client/mc/release/linux-amd64/mc \ - && chmod +x /usr/local/bin/mc - -RUN curl -Lo /usr/local/bin/swagger https://github.com/go-swagger/go-swagger/releases/download/${SWAGGER_VERSION}/swagger_linux_amd64 \ - && chmod +x /usr/local/bin/swagger - -RUN curl -Lo /usr/local/bin/terraform-doc https://github.com/segmentio/terraform-docs/releases/download/${TERRAFORM_DOC_VERSION}/terraform-docs-${TERRAFORM_DOC_VERSION}-$(uname | tr '[:upper:]' '[:lower:]')-amd64 \ - && chmod +x /usr/local/bin/terraform-doc - - -RUN curl -sSL -k https://github.com/koalaman/shellcheck/releases/download/stable/shellcheck-stable.linux.x86_64.tar.xz -o /tmp/shellcheck-stable.tar.xz \ - && tar -xvf /tmp/shellcheck-stable.tar.xz -C /tmp \ - && mv /tmp/shellcheck-stable/shellcheck /usr/local/bin/shellcheck \ - && chmod +x /usr/local/bin/shellcheck \ - && rm -rf /tmp/shellcheck-stable \ - && rm /tmp/shellcheck-stable.tar.xz - -RUN curl -Lo /usr/local/bin/skaffold https://storage.googleapis.com/skaffold/releases/latest/skaffold-linux-amd64 \ - && chmod +x /usr/local/bin/skaffold - -# install tekton binary -RUN curl -LO https://github.com/tektoncd/cli/releases/download/v${TEKTONCD_CLI_VERSION}/tkn_${TEKTONCD_CLI_VERSION}_Linux_x86_64.tar.gz \ - && tar xvzf tkn_${TEKTONCD_CLI_VERSION}_Linux_x86_64.tar.gz -C /usr/local/bin tkn \ - && rm tkn_${TEKTONCD_CLI_VERSION}_Linux_x86_64.tar.gz \ - && chmod +x /usr/local/bin/tkn - -RUN curl -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz \ - && tar xvzf kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz -C /usr/local/bin kustomize \ - && rm kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz \ - && chmod +x /usr/local/bin/kustomize - - -RUN mkdir -p /tmp/chart-testing \ - && curl -L https://github.com/helm/chart-testing/releases/download/v${HELM_CHART_TESTING_VERSION}/chart-testing_${HELM_CHART_TESTING_VERSION}_linux_amd64.tar.gz -o /tmp/chart-testing/chart-testing.tar.gz \ - && tar xvzf /tmp/chart-testing/chart-testing.tar.gz -C /tmp/chart-testing \ - && mkdir -p /etc/ct \ - && mv /tmp/chart-testing/ct /usr/local/bin/ct \ - && mv /tmp/chart-testing/etc/chart_schema.yaml /etc/ct/chart_schema.yaml \ - && mv /tmp/chart-testing/etc/lintconf.yaml /etc/ct/lintconf.yaml \ - && rm -rf /tmp/chart-testing \ - && chmod +x /usr/local/bin/ct - - -RUN mkdir -p /tmp/chart-releaser \ - && curl -L https://github.com/helm/chart-releaser/releases/download/v${HELM_CHART_RELEASER_VERSION}/chart-releaser_${HELM_CHART_RELEASER_VERSION}_linux_amd64.tar.gz -o /tmp/chart-releaser/chart-releaser.tar.gz \ - && tar xvzf /tmp/chart-releaser/chart-releaser.tar.gz -C /tmp/chart-releaser \ - && mv /tmp/chart-releaser/cr /usr/local/bin/cr \ - && rm -rf /tmp/chart-releaser \ - && chmod +x /usr/local/bin/cr - - -# https://github.com/GoogleContainerTools/container-structure-test -RUN curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-amd64 && chmod +x container-structure-test-linux-amd64 && mv container-structure-test-linux-amd64 /usr/local/bin/container-structure-test - - -RUN curl -Lo ./terraform-docs https://github.com/terraform-docs/terraform-docs/releases/download/${TERRAFORM_DOCS_VERSION}/terraform-docs-${TERRAFORM_DOCS_VERSION}-$(uname | tr '[:upper:]' '[:lower:]')-amd64 && \ - chmod +x ./terraform-docs && \ - mv ./terraform-docs /usr/local/bin/terraform-docs - -RUN mkdir -p /tmp/ghcli \ - && curl -L https://github.com/cli/cli/releases/download/v${GITHUB_CLI_VERSION}/gh_${GITHUB_CLI_VERSION}_linux_arm64.tar.gz -o /tmp/ghcli/gh.tar.gz \ - && tar xvzf /tmp/ghcli/gh.tar.gz -C /tmp/ghcli \ - && mv /tmp/ghcli/gh_${GITHUB_CLI_VERSION}_linux_arm64/bin/gh /usr/local/bin/gh \ - && rm -rf /tmp/ghcli \ - && chmod +x /usr/local/bin/gh - - - -RUN mkdir -p /tmp/packer/ \ - && curl -Lo /tmp/packer/packer.zip https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip \ - && unzip "/tmp/packer/packer.zip" -d /usr/local/bin \ - && rm -rf /tmp/packer \ - && chmod +x /usr/local/bin/packer +FROM ${FROM_REGISTRY}/${FROM_IMAGE_NAME}:${FROM_IMAGE_VERSION} USER ${USERNAME} -COPY --chown=${USER_UID}:${USER_GID} files/python-env-usage-ansible.txt /home/${USERNAME}/vens/python-env-usage-ansible.txt -#ARG WORKON_HOME=/home/${USERNAME}/.virtualenvs - -RUN mkdir -p ${WORKON_HOME} \ - && virtualenv -p python3 ${WORKON_HOME}/usage-ansible \ - && source ${WORKON_HOME}/usage-ansible/bin/activate \ - && pip install -r /home/${USERNAME}/vens/python-env-usage-ansible.txt \ - && deactivate - -COPY --chown=${USER_UID}:${USER_GID} files/devops-zshrc-specific /home/${USERNAME}/.zshrc-specific -COPY --chown=${USER_UID}:${USER_GID} files/devops-welcome.sh /home/${USERNAME}/.welcome.sh - - -#RUN mkdir -p /home/${USERNAME}/.terraform.d/plugins/linux_amd64 \ -# && curl -Lo /home/${USERNAME}/.terraform.d/plugins/linux_amd64/terraform-provider-kubectl https://github.com/gavinbunney/terraform-provider-kubectl/releases/download/${TERRAFORM_KUBECTL_PROVIDER_VERSION}/terraform-provider-kubectl-linux-amd64 \ -# && chmod +x /home/${USERNAME}/.terraform.d/plugins/linux_amd64/terraform-provider-kubectl -# -# -#RUN mkdir -p /home/${USERNAME}/.terraform.d/plugins/linux_amd64 \ -# && curl -Lo /home/${USERNAME}/.terraform.d/plugins/linux_amd64/terraform-provider-minio https://github.com/aminueza/terraform-provider-minio/releases/download/${TERRAFORM_MINIO_PROVIDER_VERSION}/terraform-provider-minio_v${TERRAFORM_MINIO_PROVIDER_VERSION}_linux_amd64 \ -# && chmod +x /home/${USERNAME}/.terraform.d/plugins/linux_amd64/terraform-provider-minio -# -# -#RUN mkdir -p /tmp/terraform-provider-keycloak/ \ -# && curl -Lo /tmp/terraform-provider-keycloak/terraform-provider-keycloak.zip https://github.com/mrparkers/terraform-provider-keycloak/releases/download/${TERRAFORM_KEYCLOAK_PROVIDER_VERSION}/terraform-provider-keycloak_v${TERRAFORM_KEYCLOAK_PROVIDER_VERSION}_linux_amd64.zip \ -# && unzip -j "/tmp/terraform-provider-keycloak/terraform-provider-keycloak.zip" "terraform-provider-keycloak_v${TERRAFORM_KEYCLOAK_PROVIDER_VERSION}" -d /home/${USERNAME}/.terraform.d/plugins/linux_amd64 \ -# && rm -rf /tmp/terraform-provider-keycloak \ -# && chmod +x /home/${USERNAME}/.terraform.d/plugins/linux_amd64/terraform-provider-keycloak* -# -# -#RUN mkdir -p /tmp/terraform-provider-harbor/ \ -# && curl -Lo /tmp/terraform-provider-harbor/terraform-provider-harbor.zip https://github.com/BESTSELLER/terraform-harbor-provider/releases/download/v${TERRAFORM_HARBOR_PROVIDER_VERSION}/terraform-harbor-provider-linux-amd64.zip \ -# && unzip -j "/tmp/terraform-provider-harbor/terraform-provider-harbor.zip" "terraform-harbor-provider" -d /home/${USERNAME}/.terraform.d/plugins/linux_amd64 \ -# && rm -rf /tmp/terraform-provider-harbor \ -# && chmod +x /home/${USERNAME}/.terraform.d/plugins/linux_amd64/terraform-harbor-provider \ -# && mv /home/${USERNAME}/.terraform.d/plugins/linux_amd64/terraform-harbor-provider /home/${USERNAME}/.terraform.d/plugins/linux_amd64/terraform-provider-harbor - - -#RUN mkdir -p /home/${USERNAME}/.terraform.d/plugins/linux_amd64 \ -# && wget -qO- https://github.com/nolte/terraform-provider-harbor/releases/download/release/v${TERRAFORM_HARBOR_PROVIDER_VERSION}/terraform-provider-harbor_v${TERRAFORM_HARBOR_PROVIDER_VERSION}_linux_amd64.tar.gz | tar -xvz -C ~/.terraform.d/plugins/linux_amd64/ \ -# && chmod +x /home/${USERNAME}/.terraform.d/plugins/linux_amd64/terraform-provider-harbor -# -#RUN mkdir -p /tmp/terraform-provider-pass/ \ -# && curl -Lo /tmp/terraform-provider-pass/terraform-provider-pass.zip https://github.com/camptocamp/terraform-provider-pass/releases/download/${TERRAFORM_PASS_PROVIDER_VERSION}/terraform-provider-pass_${TERRAFORM_PASS_PROVIDER_VERSION}_linux_amd64.zip \ -# && unzip -j "/tmp/terraform-provider-pass/terraform-provider-pass.zip" "bin/terraform-provider-pass_${TERRAFORM_PASS_PROVIDER_VERSION}_linux_amd64" -d /home/${USERNAME}/.terraform.d/plugins/linux_amd64 \ -# && rm -rf /tmp/terraform-provider-pass \ -# && chmod +x /home/${USERNAME}/.terraform.d/plugins/linux_amd64/terraform-provider-pass_${TERRAFORM_PASS_PROVIDER_VERSION}_linux_amd64 \ -# && mv /home/${USERNAME}/.terraform.d/plugins/linux_amd64/terraform-provider-pass_${TERRAFORM_PASS_PROVIDER_VERSION}_linux_amd64 /home/${USERNAME}/.terraform.d/plugins/linux_amd64/terraform-provider-pass -# -# TODO Find better way for local compiled providers -# COPY --chown=${USER_UID}:${USER_GID} ./providers/terraform-provider-gitea_v1.0_linux_amd64 /home/${USERNAME}/.terraform.d/plugins/linux_amd64/terraform-provider-gitea - -RUN mkdir -p /home/${USERNAME}/.oh-my-zsh/custom/plugins/ \ - && git clone https://github.com/johanhaleby/kubetail.git /home/${USERNAME}/.oh-my-zsh/custom/plugins/kubetail - -RUN mkdir -p /home/${USERNAME}/.docker/cli-plugins/ \ - && curl -Lo /home/${USERNAME}/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/${DOCKERX_VERSION}/buildx-${DOCKERX_VERSION}.linux-amd64 \ - && chmod +x /home/${USERNAME}/.docker/cli-plugins/docker-buildx +ENV ASDF_VERSION=v0.13.1 +COPY --chown=${USER_UID}:${USER_GID} files/.tool-versions /home/${USERNAME}/.tool-versions +COPY --chown=${USER_UID}:${USER_GID} files/.zshrc /home/${USERNAME}/.zshrc -RUN mkdir "/home/${USERNAME}/.npm-packages" -RUN npm config set prefix "/home/${USERNAME}/.npm-packages" +RUN git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch ${ASDF_VERSION} && \ + echo '. $HOME/.asdf/asdf.sh' >> $HOME/.bashrc && \ + echo '. $HOME/.asdf/asdf.sh' >> $HOME/.profile -RUN curl https://raw.githubusercontent.com/nektos/act/master/install.sh | sudo bash +ENV PATH="${PATH}:/home/${USERNAME}/.asdf/shims:/home/${USERNAME}/.asdf/bin" -RUN npm i madr adr-log -g -RUN helm plugin install https://github.com/databus23/helm-diff \ - && helm plugin install https://github.com/fabmation-gmbh/helm-whatup +RUN asdf plugin add chezmoi https://github.com/nolte/asdf-chezmoi.git \ + && asdf plugin update chezmoi fix/39-alpine-usage \ + && asdf install -RUN curl -L "$(curl -s https://api.github.com/repos/terraform-linters/tflint/releases/latest | grep -o -E "https://.+?_linux_amd64.zip")" > tflint.zip && unzip tflint.zip && rm tflint.zip && sudo mv tflint /usr/local/bin +ENV ASDF_DIR="/home/${USERNAME}/.asdf" -RUN git config --global init.templateDir /home/${USERNAME}/.git-template \ - && source ~/.virtualenvs/development/bin/activate \ - && pre-commit init-templatedir -t pre-commit /home/${USERNAME}/.git-template \ No newline at end of file +RUN chezmoi init https://github.com/nolte/workstation.git --branch feature/toolset \ + && source ~/.bashrc \ + && chezmoi apply \ + && asdf install diff --git a/images/devops/files/.tool-versions b/images/devops/files/.tool-versions new file mode 100644 index 0000000..ff2796e --- /dev/null +++ b/images/devops/files/.tool-versions @@ -0,0 +1 @@ +chezmoi 2.40.0 \ No newline at end of file diff --git a/images/devops/files/.zshrc b/images/devops/files/.zshrc new file mode 100644 index 0000000..972343a --- /dev/null +++ b/images/devops/files/.zshrc @@ -0,0 +1,39 @@ + +# Path to your oh-my-zsh installation. +export ZSH=$HOME/.oh-my-zsh + +# Set name of the theme to load --- if set to "random", it will +# load a random theme each time oh-my-zsh is loaded, in which case, +# to know which specific one was loaded, run: echo $RANDOM_THEME +# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes +ZSH_THEME="agnoster" + +# Uncomment the following line to disable bi-weekly auto-update checks. +DISABLE_AUTO_UPDATE="true" + +# Which plugins would you like to load? +# Standard plugins can be found in ~/.oh-my-zsh/plugins/* +# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=(asdf git helm kubectl pass terraform vault) + +source $ZSH/oh-my-zsh.sh + + +source <(kubectl completion zsh) +source <(helm completion zsh) +source <(chezmoi completion zsh) +source <(argocd completion zsh) +source <(argo completion zsh) + + +# display kubctl context +autoload -U colors; colors +# source $ZSH/custom/plugins/zsh-kubectl-prompt/kubectl.zsh +RPROMPT='%{$fg[blue]%}($ZSH_KUBECTL_PROMPT)%{$reset_color%}' + +if [ -e "$HOME/.asdf/asdf.sh" ]; then + source $HOME/.asdf/asdf.sh + source $HOME/.asdf/completions/asdf.bash +fi From 3951b80d537510613106f1e782014323dec99689 Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 19:31:57 +0200 Subject: [PATCH 02/53] bump up --- .github/workflows/dockerimage.yml | 2 +- images/commons-golang/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index a7ff9ff..0612739 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -2,7 +2,7 @@ name: Docker Image CI on: push: - branches: ["feature/ghworkflow", "master"] + branches: ["feature/bump-up", "master"] pull_request: branches: [master] diff --git a/images/commons-golang/Dockerfile b/images/commons-golang/Dockerfile index cdf744f..e89daad 100644 --- a/images/commons-golang/Dockerfile +++ b/images/commons-golang/Dockerfile @@ -1,8 +1,8 @@ ARG FROM_REGISTRY=docker.pkg.github.com/nolte/vscode-devcontainers ARG FROM_IMAGE_NAME=commons ARG FROM_IMAGE_VERSION=latest -ARG ALPINE_VERSION=3.17 -ARG GO_VERSION=1.20 +ARG ALPINE_VERSION=3.18 +ARG GO_VERSION=1.21 # See https://github.com/golang/go/issues/14481 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS race From 5ed7fcd130844f042df9c4fbc4e26a09a43364f6 Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 19:58:36 +0200 Subject: [PATCH 03/53] add id --- .github/workflows/dockerimage.yml | 182 +++++++++++++++--------------- 1 file changed, 94 insertions(+), 88 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 0612739..58bf0e1 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -13,8 +13,9 @@ jobs: - uses: actions/checkout@v2 #- name: Build the Docker image # run: docker build -f ./images/commons/Dockerfile -t vscode-commons:$(date +%s) ./images/commons/. - - name: Push to GitHub Packages - uses: docker/build-push-action@v1.1.0 + - id: build + name: Push to GitHub Packages + uses: docker/build-push-action@v5.0.0 with: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} @@ -25,13 +26,17 @@ jobs: tag_with_ref: false add_git_labels: true tags: latest + + outputs: + digest: ${{ steps.build.outputs.digest }} + commonsgolang: runs-on: ubuntu-latest needs: commons steps: - uses: actions/checkout@v2 - name: Push to GitHub Packages - uses: docker/build-push-action@v1.1.0 + uses: docker/build-push-action@v5.0.0 with: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} @@ -42,88 +47,89 @@ jobs: tag_with_ref: false add_git_labels: true tags: latest - devgolang: - runs-on: ubuntu-latest - needs: commonsgolang - steps: - - uses: actions/checkout@v2 - - name: Push to GitHub Packages - uses: docker/build-push-action@v1.1.0 - with: - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: docker.pkg.github.com - repository: nolte/vscode-devcontainers/golang - dockerfile: ./images/dev-golang/Dockerfile - path: ./images/dev-golang/. - tag_with_ref: false - add_git_labels: true - tags: latest - devops: - runs-on: ubuntu-latest - needs: devgolang - steps: - - uses: actions/checkout@v2 - - name: Push to GitHub Packages - uses: docker/build-push-action@v1.1.0 - with: - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: docker.pkg.github.com - repository: nolte/vscode-devcontainers/devops - dockerfile: ./images/devops/Dockerfile - path: ./images/devops/. - tag_with_ref: false - add_git_labels: true - tags: latest - npm: - runs-on: ubuntu-latest - needs: devgolang - steps: - - uses: actions/checkout@v2 - - name: Push to GitHub Packages - uses: docker/build-push-action@v1.1.0 - with: - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: docker.pkg.github.com - repository: nolte/vscode-devcontainers/npm - dockerfile: ./images/npm/Dockerfile - path: ./images/npm/. - tag_with_ref: false - add_git_labels: true - tags: latest - python: - runs-on: ubuntu-latest - needs: devgolang - steps: - - uses: actions/checkout@v2 - - name: Push to GitHub Packages - uses: docker/build-push-action@v1.1.0 - with: - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: docker.pkg.github.com - repository: nolte/vscode-devcontainers/python - dockerfile: ./images/python/Dockerfile - path: ./images/python/. - tag_with_ref: false - add_git_labels: true - tags: latest - k8soperator: - runs-on: ubuntu-latest - needs: [devgolang, devops] - steps: - - uses: actions/checkout@v2 - - name: Push to GitHub Packages - uses: docker/build-push-action@v1.1.0 - with: - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: docker.pkg.github.com - repository: nolte/vscode-devcontainers/k8s-operator - dockerfile: ./images/k8sOperator/Dockerfile - path: ./images/k8sOperator/. - tag_with_ref: false - add_git_labels: true - tags: latest + build-args: FROM_IMAGE_VERSION=${{commons.buikd.outputs.digest}} + # devgolang: + # runs-on: ubuntu-latest + # needs: commonsgolang + # steps: + # - uses: actions/checkout@v2 + # - name: Push to GitHub Packages + # uses: docker/build-push-action@v5.0.0 + # with: + # username: ${{ github.actor }} + # password: ${{ secrets.GITHUB_TOKEN }} + # registry: docker.pkg.github.com + # repository: nolte/vscode-devcontainers/golang + # dockerfile: ./images/dev-golang/Dockerfile + # path: ./images/dev-golang/. + # tag_with_ref: false + # add_git_labels: true + # tags: latest + # devops: + # runs-on: ubuntu-latest + # needs: devgolang + # steps: + # - uses: actions/checkout@v2 + # - name: Push to GitHub Packages + # uses: docker/build-push-action@v5.0.0 + # with: + # username: ${{ github.actor }} + # password: ${{ secrets.GITHUB_TOKEN }} + # registry: docker.pkg.github.com + # repository: nolte/vscode-devcontainers/devops + # dockerfile: ./images/devops/Dockerfile + # path: ./images/devops/. + # tag_with_ref: false + # add_git_labels: true + # tags: latest + # npm: + # runs-on: ubuntu-latest + # needs: devgolang + # steps: + # - uses: actions/checkout@v2 + # - name: Push to GitHub Packages + # uses: docker/build-push-action@v5.0.0 + # with: + # username: ${{ github.actor }} + # password: ${{ secrets.GITHUB_TOKEN }} + # registry: docker.pkg.github.com + # repository: nolte/vscode-devcontainers/npm + # dockerfile: ./images/npm/Dockerfile + # path: ./images/npm/. + # tag_with_ref: false + # add_git_labels: true + # tags: latest + # python: + # runs-on: ubuntu-latest + # needs: devgolang + # steps: + # - uses: actions/checkout@v2 + # - name: Push to GitHub Packages + # uses: docker/build-push-action@v5.0.0 + # with: + # username: ${{ github.actor }} + # password: ${{ secrets.GITHUB_TOKEN }} + # registry: docker.pkg.github.com + # repository: nolte/vscode-devcontainers/python + # dockerfile: ./images/python/Dockerfile + # path: ./images/python/. + # tag_with_ref: false + # add_git_labels: true + # tags: latest + # k8soperator: + # runs-on: ubuntu-latest + # needs: [devgolang, devops] + # steps: + # - uses: actions/checkout@v2 + # - name: Push to GitHub Packages + # uses: docker/build-push-action@v5.0.0 + # with: + # username: ${{ github.actor }} + # password: ${{ secrets.GITHUB_TOKEN }} + # registry: docker.pkg.github.com + # repository: nolte/vscode-devcontainers/k8s-operator + # dockerfile: ./images/k8sOperator/Dockerfile + # path: ./images/k8sOperator/. + # tag_with_ref: false + # add_git_labels: true + # tags: latest From a66d52c18c862c1133c4089c35cb9916dcc4c8bc Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 20:01:36 +0200 Subject: [PATCH 04/53] ... --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 58bf0e1..f417f84 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -47,7 +47,7 @@ jobs: tag_with_ref: false add_git_labels: true tags: latest - build-args: FROM_IMAGE_VERSION=${{commons.buikd.outputs.digest}} + build-args: FROM_IMAGE_VERSION=${{commons.build.outputs.digest}} # devgolang: # runs-on: ubuntu-latest # needs: commonsgolang From f2551d795a3d6deb78f8caf870f386b901ac9a4a Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 20:03:19 +0200 Subject: [PATCH 05/53] ... --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index f417f84..eeab1ad 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -47,7 +47,7 @@ jobs: tag_with_ref: false add_git_labels: true tags: latest - build-args: FROM_IMAGE_VERSION=${{commons.build.outputs.digest}} + build-args: FROM_IMAGE_VERSION=${{needs.commons.build.outputs.digest}} # devgolang: # runs-on: ubuntu-latest # needs: commonsgolang From ae0da1f4c2bf32ab74df758a3c633fa74b557f03 Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 20:10:42 +0200 Subject: [PATCH 06/53] :( --- .github/workflows/dockerimage.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index eeab1ad..486844c 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -26,9 +26,8 @@ jobs: tag_with_ref: false add_git_labels: true tags: latest - - outputs: - digest: ${{ steps.build.outputs.digest }} + # outputs: + # digest: ${{ steps.build.outputs.digest }} commonsgolang: runs-on: ubuntu-latest @@ -47,7 +46,7 @@ jobs: tag_with_ref: false add_git_labels: true tags: latest - build-args: FROM_IMAGE_VERSION=${{needs.commons.build.outputs.digest}} + # build-args: FROM_IMAGE_VERSION=${{needs.commons.build.outputs.digest}} # devgolang: # runs-on: ubuntu-latest # needs: commonsgolang From df6f6936fab481eba1109fe7ce608b8660a91bd9 Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 20:17:09 +0200 Subject: [PATCH 07/53] remove id --- .github/workflows/dockerimage.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 486844c..673710b 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -13,8 +13,7 @@ jobs: - uses: actions/checkout@v2 #- name: Build the Docker image # run: docker build -f ./images/commons/Dockerfile -t vscode-commons:$(date +%s) ./images/commons/. - - id: build - name: Push to GitHub Packages + - name: Push to GitHub Packages uses: docker/build-push-action@v5.0.0 with: username: ${{ github.actor }} From 20b4359c2ad6bf1d32d5e93056f4c0f12514ba2d Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 20:22:10 +0200 Subject: [PATCH 08/53] ... --- .github/workflows/dockerimage.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 673710b..5431248 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -20,10 +20,10 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} registry: docker.pkg.github.com repository: nolte/vscode-devcontainers/commons - dockerfile: ./images/commons/Dockerfile - path: ./images/commons/. - tag_with_ref: false - add_git_labels: true + # file: ./images/commons/Dockerfile + context: ./images/commons/. + #tag_with_ref: false + #add_git_labels: true tags: latest # outputs: # digest: ${{ steps.build.outputs.digest }} From 9b2fd4882f73530d5fbd0ce6383a9ad037f9887d Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 20:26:30 +0200 Subject: [PATCH 09/53] ... --- .github/workflows/dockerimage.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 5431248..eb860bb 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -13,7 +13,8 @@ jobs: - uses: actions/checkout@v2 #- name: Build the Docker image # run: docker build -f ./images/commons/Dockerfile -t vscode-commons:$(date +%s) ./images/commons/. - - name: Push to GitHub Packages + - id: build + name: Push to GitHub Packages uses: docker/build-push-action@v5.0.0 with: username: ${{ github.actor }} @@ -25,8 +26,8 @@ jobs: #tag_with_ref: false #add_git_labels: true tags: latest - # outputs: - # digest: ${{ steps.build.outputs.digest }} + outputs: + digest: ${{ steps.build.outputs.digest }} commonsgolang: runs-on: ubuntu-latest @@ -40,12 +41,12 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} registry: docker.pkg.github.com repository: nolte/vscode-devcontainers/commons-golang - dockerfile: ./images/commons-golang/Dockerfile - path: ./images/commons-golang/. - tag_with_ref: false - add_git_labels: true + #dockerfile: ./images/commons-golang/Dockerfile + context: ./images/commons-golang/. + #tag_with_ref: false + #add_git_labels: true tags: latest - # build-args: FROM_IMAGE_VERSION=${{needs.commons.build.outputs.digest}} + build-args: FROM_IMAGE_VERSION=${{needs.commons.build.outputs.digest}} # devgolang: # runs-on: ubuntu-latest # needs: commonsgolang From 9fe8c66ac299a4e62451140e42d398ff9e19522b Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 20:38:27 +0200 Subject: [PATCH 10/53] da --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index eb860bb..f4f33f9 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -46,7 +46,7 @@ jobs: #tag_with_ref: false #add_git_labels: true tags: latest - build-args: FROM_IMAGE_VERSION=${{needs.commons.build.outputs.digest}} + build-args: FROM_IMAGE_VERSION=${{needs.commons.digest}} # devgolang: # runs-on: ubuntu-latest # needs: commonsgolang From 71bc350d96ae25f5b84df06a3b25e20824904e45 Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 20:42:07 +0200 Subject: [PATCH 11/53] fix --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index f4f33f9..5c133c6 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -46,7 +46,7 @@ jobs: #tag_with_ref: false #add_git_labels: true tags: latest - build-args: FROM_IMAGE_VERSION=${{needs.commons.digest}} + build-args: FROM_IMAGE_VERSION=latest # devgolang: # runs-on: ubuntu-latest # needs: commonsgolang From b5febd30435ec944211c683f5cb8562d7ac35cb5 Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 20:42:49 +0200 Subject: [PATCH 12/53] da --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 5c133c6..3fc48aa 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -46,7 +46,7 @@ jobs: #tag_with_ref: false #add_git_labels: true tags: latest - build-args: FROM_IMAGE_VERSION=latest + build-args: FROM_IMAGE_VERSION=${{needs.commons.outputs.digest}} # devgolang: # runs-on: ubuntu-latest # needs: commonsgolang From 6ede7ab59db2d57faf571a3860a5793dc5afbc2a Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 21:29:23 +0200 Subject: [PATCH 13/53] ... --- images/commons-golang/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/commons-golang/Dockerfile b/images/commons-golang/Dockerfile index e89daad..e54ebe4 100644 --- a/images/commons-golang/Dockerfile +++ b/images/commons-golang/Dockerfile @@ -1,6 +1,6 @@ ARG FROM_REGISTRY=docker.pkg.github.com/nolte/vscode-devcontainers ARG FROM_IMAGE_NAME=commons -ARG FROM_IMAGE_VERSION=latest +ARG FROM_IMAGE_VERSION=:latest ARG ALPINE_VERSION=3.18 ARG GO_VERSION=1.21 @@ -17,7 +17,7 @@ FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS race #RUN sed -e 's,-Wno-unknown-warning-option,-Wno-error=deprecated,' -i buildgo.sh #RUN ./buildgo.sh -FROM ${FROM_REGISTRY}/${FROM_IMAGE_NAME}:${FROM_IMAGE_VERSION} +FROM ${FROM_REGISTRY}/${FROM_IMAGE_NAME}${FROM_IMAGE_VERSION} ARG BUILD_DATE ARG VCS_REF From 10c195f160ced198b8395eb30876fd90b47be48f Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 21:31:31 +0200 Subject: [PATCH 14/53] da --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 3fc48aa..3b63cde 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -46,7 +46,7 @@ jobs: #tag_with_ref: false #add_git_labels: true tags: latest - build-args: FROM_IMAGE_VERSION=${{needs.commons.outputs.digest}} + build-args: FROM_IMAGE_VERSION=@${{needs.commons.outputs.digest}} # devgolang: # runs-on: ubuntu-latest # needs: commonsgolang From d45ea00f0ff7fa8cc934c3b7b7083d9182d6dfc5 Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 21:43:15 +0200 Subject: [PATCH 15/53] da --- .github/workflows/dockerimage.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 3b63cde..6bafad5 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -26,6 +26,13 @@ jobs: #tag_with_ref: false #add_git_labels: true tags: latest + outputs: type=docker,dest=/tmp/myimage.tar + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: myimage + path: /tmp/myimage.tar + outputs: digest: ${{ steps.build.outputs.digest }} @@ -34,6 +41,14 @@ jobs: needs: commons steps: - uses: actions/checkout@v2 + - name: Download artifact + uses: actions/download-artifact@v3 + with: + name: myimage + path: /tmp + - name: Load image + run: | + docker load --input /tmp/myimage.tar - name: Push to GitHub Packages uses: docker/build-push-action@v5.0.0 with: @@ -46,7 +61,7 @@ jobs: #tag_with_ref: false #add_git_labels: true tags: latest - build-args: FROM_IMAGE_VERSION=@${{needs.commons.outputs.digest}} + #build-args: FROM_IMAGE_VERSION=@${{needs.commons.outputs.digest}} # devgolang: # runs-on: ubuntu-latest # needs: commonsgolang From 59be1463f4e20d8c05ca6d2178b66c88c0f24211 Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 21:49:03 +0200 Subject: [PATCH 16/53] add configs --- .github/workflows/dockerimage.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 6bafad5..9e269fb 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -10,7 +10,10 @@ jobs: commons: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 #- name: Build the Docker image # run: docker build -f ./images/commons/Dockerfile -t vscode-commons:$(date +%s) ./images/commons/. - id: build From 6245a2a048a7a179a82a67bdb3652146731edd63 Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 22:04:20 +0200 Subject: [PATCH 17/53] debug --- .github/workflows/dockerimage.yml | 11 ++++++----- images/commons-golang/Dockerfile | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 9e269fb..2c298dc 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -29,12 +29,12 @@ jobs: #tag_with_ref: false #add_git_labels: true tags: latest - outputs: type=docker,dest=/tmp/myimage.tar + outputs: type=docker,dest=/tmp/commons.tar - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: myimage - path: /tmp/myimage.tar + name: commons + path: /tmp/commons.tar outputs: digest: ${{ steps.build.outputs.digest }} @@ -47,11 +47,12 @@ jobs: - name: Download artifact uses: actions/download-artifact@v3 with: - name: myimage + name: commons path: /tmp - name: Load image run: | - docker load --input /tmp/myimage.tar + docker load --input /tmp/commons.tar + docker image ls -a - name: Push to GitHub Packages uses: docker/build-push-action@v5.0.0 with: diff --git a/images/commons-golang/Dockerfile b/images/commons-golang/Dockerfile index e54ebe4..e89daad 100644 --- a/images/commons-golang/Dockerfile +++ b/images/commons-golang/Dockerfile @@ -1,6 +1,6 @@ ARG FROM_REGISTRY=docker.pkg.github.com/nolte/vscode-devcontainers ARG FROM_IMAGE_NAME=commons -ARG FROM_IMAGE_VERSION=:latest +ARG FROM_IMAGE_VERSION=latest ARG ALPINE_VERSION=3.18 ARG GO_VERSION=1.21 @@ -17,7 +17,7 @@ FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS race #RUN sed -e 's,-Wno-unknown-warning-option,-Wno-error=deprecated,' -i buildgo.sh #RUN ./buildgo.sh -FROM ${FROM_REGISTRY}/${FROM_IMAGE_NAME}${FROM_IMAGE_VERSION} +FROM ${FROM_REGISTRY}/${FROM_IMAGE_NAME}:${FROM_IMAGE_VERSION} ARG BUILD_DATE ARG VCS_REF From d34533d7a8ca2fd3e36537b6ed5eb69ff9174c6c Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 22:17:32 +0200 Subject: [PATCH 18/53] ... --- .github/workflows/dockerimage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 2c298dc..11fbae8 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -28,7 +28,7 @@ jobs: context: ./images/commons/. #tag_with_ref: false #add_git_labels: true - tags: latest + tags: docker.pkg.github.com/nolte/vscode-devcontainers/commons outputs: type=docker,dest=/tmp/commons.tar - name: Upload artifact uses: actions/upload-artifact@v3 @@ -64,7 +64,7 @@ jobs: context: ./images/commons-golang/. #tag_with_ref: false #add_git_labels: true - tags: latest + tags: docker.pkg.github.com/nolte/vscode-devcontainers/commons-golang #build-args: FROM_IMAGE_VERSION=@${{needs.commons.outputs.digest}} # devgolang: # runs-on: ubuntu-latest From 376885e5e192319fb4647ca1cc569094d6a96a8e Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 22:43:48 +0200 Subject: [PATCH 19/53] add devops build --- .github/workflows/dockerimage.yml | 37 ++++++++++++++++++------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 11fbae8..35167ec 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -20,14 +20,7 @@ jobs: name: Push to GitHub Packages uses: docker/build-push-action@v5.0.0 with: - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: docker.pkg.github.com - repository: nolte/vscode-devcontainers/commons - # file: ./images/commons/Dockerfile context: ./images/commons/. - #tag_with_ref: false - #add_git_labels: true tags: docker.pkg.github.com/nolte/vscode-devcontainers/commons outputs: type=docker,dest=/tmp/commons.tar - name: Upload artifact @@ -39,6 +32,26 @@ jobs: outputs: digest: ${{ steps.build.outputs.digest }} + devops: + runs-on: ubuntu-latest + needs: commons + steps: + - uses: actions/checkout@v2 + - name: Download artifact + uses: actions/download-artifact@v3 + with: + name: commons + path: /tmp + - name: Load image + run: | + docker load --input /tmp/commons.tar + + - name: Push to GitHub Packages + uses: docker/build-push-action@v5.0.0 + with: + context: ./images/devops/. + tags: docker.pkg.github.com/nolte/vscode-devcontainers/devops + commonsgolang: runs-on: ubuntu-latest needs: commons @@ -52,20 +65,12 @@ jobs: - name: Load image run: | docker load --input /tmp/commons.tar - docker image ls -a + - name: Push to GitHub Packages uses: docker/build-push-action@v5.0.0 with: - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: docker.pkg.github.com - repository: nolte/vscode-devcontainers/commons-golang - #dockerfile: ./images/commons-golang/Dockerfile context: ./images/commons-golang/. - #tag_with_ref: false - #add_git_labels: true tags: docker.pkg.github.com/nolte/vscode-devcontainers/commons-golang - #build-args: FROM_IMAGE_VERSION=@${{needs.commons.outputs.digest}} # devgolang: # runs-on: ubuntu-latest # needs: commonsgolang From 6074b98f9462221adb4558a5e5e30e771ea60cca Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 22:54:36 +0200 Subject: [PATCH 20/53] add extra lib --- images/commons/Dockerfile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/images/commons/Dockerfile b/images/commons/Dockerfile index b0f5b10..4edf185 100644 --- a/images/commons/Dockerfile +++ b/images/commons/Dockerfile @@ -31,20 +31,22 @@ ENV PYTHONUNBUFFERED=1 RUN echo "**** install Python ****" && \ apk add --update-cache \ - curl wget \ - zlib-dev \ + bash \ boost-regex \ - sed \ + bzip2-dev \ + curl wget \ jq tar rsync unzip tree vim \ - bash \ - zip \ + libbz2 \ + ncurses-dev \ + readline-dev \ + sed \ + sqlite \ + sqlite-dev \ tar \ xz \ xz-dev \ - sqlite \ - sqlite-dev \ - ncurses-dev \ - readline-dev \ + zip \ + zlib-dev \ libc6-compat python3 build-base python3-dev libffi libffi-dev openssl-dev \ linux-headers gnupg openssl gcc build-base libc-dev musl-dev ca-certificates \ && rm -rf /var/cache/apk/* && \ From bcc81077b5eb136e9ae74ddd5296948967a636f2 Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 23:25:19 +0200 Subject: [PATCH 21/53] add python build --- .github/workflows/dockerimage.yml | 111 +++++++----------------------- 1 file changed, 26 insertions(+), 85 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 35167ec..fe8d6a1 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -71,88 +71,29 @@ jobs: with: context: ./images/commons-golang/. tags: docker.pkg.github.com/nolte/vscode-devcontainers/commons-golang - # devgolang: - # runs-on: ubuntu-latest - # needs: commonsgolang - # steps: - # - uses: actions/checkout@v2 - # - name: Push to GitHub Packages - # uses: docker/build-push-action@v5.0.0 - # with: - # username: ${{ github.actor }} - # password: ${{ secrets.GITHUB_TOKEN }} - # registry: docker.pkg.github.com - # repository: nolte/vscode-devcontainers/golang - # dockerfile: ./images/dev-golang/Dockerfile - # path: ./images/dev-golang/. - # tag_with_ref: false - # add_git_labels: true - # tags: latest - # devops: - # runs-on: ubuntu-latest - # needs: devgolang - # steps: - # - uses: actions/checkout@v2 - # - name: Push to GitHub Packages - # uses: docker/build-push-action@v5.0.0 - # with: - # username: ${{ github.actor }} - # password: ${{ secrets.GITHUB_TOKEN }} - # registry: docker.pkg.github.com - # repository: nolte/vscode-devcontainers/devops - # dockerfile: ./images/devops/Dockerfile - # path: ./images/devops/. - # tag_with_ref: false - # add_git_labels: true - # tags: latest - # npm: - # runs-on: ubuntu-latest - # needs: devgolang - # steps: - # - uses: actions/checkout@v2 - # - name: Push to GitHub Packages - # uses: docker/build-push-action@v5.0.0 - # with: - # username: ${{ github.actor }} - # password: ${{ secrets.GITHUB_TOKEN }} - # registry: docker.pkg.github.com - # repository: nolte/vscode-devcontainers/npm - # dockerfile: ./images/npm/Dockerfile - # path: ./images/npm/. - # tag_with_ref: false - # add_git_labels: true - # tags: latest - # python: - # runs-on: ubuntu-latest - # needs: devgolang - # steps: - # - uses: actions/checkout@v2 - # - name: Push to GitHub Packages - # uses: docker/build-push-action@v5.0.0 - # with: - # username: ${{ github.actor }} - # password: ${{ secrets.GITHUB_TOKEN }} - # registry: docker.pkg.github.com - # repository: nolte/vscode-devcontainers/python - # dockerfile: ./images/python/Dockerfile - # path: ./images/python/. - # tag_with_ref: false - # add_git_labels: true - # tags: latest - # k8soperator: - # runs-on: ubuntu-latest - # needs: [devgolang, devops] - # steps: - # - uses: actions/checkout@v2 - # - name: Push to GitHub Packages - # uses: docker/build-push-action@v5.0.0 - # with: - # username: ${{ github.actor }} - # password: ${{ secrets.GITHUB_TOKEN }} - # registry: docker.pkg.github.com - # repository: nolte/vscode-devcontainers/k8s-operator - # dockerfile: ./images/k8sOperator/Dockerfile - # path: ./images/k8sOperator/. - # tag_with_ref: false - # add_git_labels: true - # tags: latest + outputs: type=docker,dest=/tmp/commons-golang.tar + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: commons-golang + path: /tmp/commons-golang.tar + + python: + runs-on: ubuntu-latest + needs: commonsgolang + steps: + - uses: actions/checkout@v2 + - name: Download artifact + uses: actions/download-artifact@v3 + with: + name: commons-golang + path: /tmp + - name: Load image + run: | + docker load --input /tmp/commons-golang.tar + + - name: Push to GitHub Packages + uses: docker/build-push-action@v5.0.0 + with: + context: ./images/python/. + tags: docker.pkg.github.com/nolte/vscode-devcontainers/python \ No newline at end of file From 0bc63dc8b71085684980bcf1ae6bfae0ef186889 Mon Sep 17 00:00:00 2001 From: nolte Date: Thu, 28 Sep 2023 23:35:30 +0200 Subject: [PATCH 22/53] config steps --- .github/workflows/dockerimage.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index fe8d6a1..8ca3e50 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -36,7 +36,10 @@ jobs: runs-on: ubuntu-latest needs: commons steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - name: Download artifact uses: actions/download-artifact@v3 with: @@ -56,7 +59,10 @@ jobs: runs-on: ubuntu-latest needs: commons steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - name: Download artifact uses: actions/download-artifact@v3 with: @@ -72,6 +78,7 @@ jobs: context: ./images/commons-golang/. tags: docker.pkg.github.com/nolte/vscode-devcontainers/commons-golang outputs: type=docker,dest=/tmp/commons-golang.tar + - name: Upload artifact uses: actions/upload-artifact@v3 with: @@ -82,7 +89,10 @@ jobs: runs-on: ubuntu-latest needs: commonsgolang steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - name: Download artifact uses: actions/download-artifact@v3 with: From 433f8ee7e8a5fa6ab03178ecf51bf190e10d90dd Mon Sep 17 00:00:00 2001 From: nolte Date: Fri, 29 Sep 2023 00:01:42 +0200 Subject: [PATCH 23/53] renamed registry --- .github/workflows/dockerimage.yml | 15 +++++++++++---- Makefile | 2 +- images/commons-golang/Dockerfile | 2 +- images/dev-golang/Dockerfile | 2 +- images/devops/Dockerfile | 2 +- images/iot/Dockerfile | 2 +- images/python/Dockerfile | 2 +- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 8ca3e50..b47d996 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -21,7 +21,7 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/commons/. - tags: docker.pkg.github.com/nolte/vscode-devcontainers/commons + tags: ghcr.io/nolte/vscode-devcontainers/commons outputs: type=docker,dest=/tmp/commons.tar - name: Upload artifact uses: actions/upload-artifact@v3 @@ -38,6 +38,13 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Download artifact @@ -53,7 +60,7 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/devops/. - tags: docker.pkg.github.com/nolte/vscode-devcontainers/devops + tags: ghcr.io/nolte/vscode-devcontainers/devops commonsgolang: runs-on: ubuntu-latest @@ -76,7 +83,7 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/commons-golang/. - tags: docker.pkg.github.com/nolte/vscode-devcontainers/commons-golang + tags: ghcr.io/nolte/vscode-devcontainers/commons-golang outputs: type=docker,dest=/tmp/commons-golang.tar - name: Upload artifact @@ -106,4 +113,4 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/python/. - tags: docker.pkg.github.com/nolte/vscode-devcontainers/python \ No newline at end of file + tags: ghcr.io/nolte/vscode-devcontainers/python \ No newline at end of file diff --git a/Makefile b/Makefile index cbc402b..d05969d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .PHONY: build -REGISTRY=docker.pkg.github.com/nolte/vscode-devcontainers +REGISTRY=ghcr.io/nolte/vscode-devcontainers default: build diff --git a/images/commons-golang/Dockerfile b/images/commons-golang/Dockerfile index e89daad..ce6a4ca 100644 --- a/images/commons-golang/Dockerfile +++ b/images/commons-golang/Dockerfile @@ -1,4 +1,4 @@ -ARG FROM_REGISTRY=docker.pkg.github.com/nolte/vscode-devcontainers +ARG FROM_REGISTRY=ghcr.io/nolte/vscode-devcontainers ARG FROM_IMAGE_NAME=commons ARG FROM_IMAGE_VERSION=latest ARG ALPINE_VERSION=3.18 diff --git a/images/dev-golang/Dockerfile b/images/dev-golang/Dockerfile index 0f7ef9d..1be7a9e 100644 --- a/images/dev-golang/Dockerfile +++ b/images/dev-golang/Dockerfile @@ -1,4 +1,4 @@ -ARG FROM_REGISTRY=docker.pkg.github.com/nolte/vscode-devcontainers +ARG FROM_REGISTRY=ghcr.io/nolte/vscode-devcontainers ARG FROM_IMAGE_NAME=commons-golang ARG FROM_IMAGE_VERSION=latest FROM ${FROM_REGISTRY}/${FROM_IMAGE_NAME}:${FROM_IMAGE_VERSION} diff --git a/images/devops/Dockerfile b/images/devops/Dockerfile index e359635..1d4c4de 100644 --- a/images/devops/Dockerfile +++ b/images/devops/Dockerfile @@ -1,4 +1,4 @@ -ARG FROM_REGISTRY=docker.pkg.github.com/nolte/vscode-devcontainers +ARG FROM_REGISTRY=ghcr.io/nolte/vscode-devcontainers ARG FROM_IMAGE_NAME=commons #ARG FROM_IMAGE_NAME=golang ARG FROM_IMAGE_VERSION=latest diff --git a/images/iot/Dockerfile b/images/iot/Dockerfile index 49d69ac..6c5c05c 100644 --- a/images/iot/Dockerfile +++ b/images/iot/Dockerfile @@ -1,4 +1,4 @@ -ARG FROM_REGISTRY=docker.pkg.github.com/nolte/vscode-devcontainers +ARG FROM_REGISTRY=ghcr.io/nolte/vscode-devcontainers ARG FROM_IMAGE_NAME=commons-golang ARG FROM_IMAGE_VERSION=latest FROM ${FROM_REGISTRY}/${FROM_IMAGE_NAME}:${FROM_IMAGE_VERSION} diff --git a/images/python/Dockerfile b/images/python/Dockerfile index fa6677a..908b45e 100644 --- a/images/python/Dockerfile +++ b/images/python/Dockerfile @@ -1,4 +1,4 @@ -ARG FROM_REGISTRY=docker.pkg.github.com/nolte/vscode-devcontainers +ARG FROM_REGISTRY=ghcr.io/nolte/vscode-devcontainers ARG FROM_IMAGE_NAME=commons-golang ARG FROM_IMAGE_VERSION=latest FROM ${FROM_REGISTRY}/${FROM_IMAGE_NAME}:${FROM_IMAGE_VERSION} From ff40173aa3fe39e23617439ba225e5e63a07be54 Mon Sep 17 00:00:00 2001 From: nolte Date: Fri, 29 Sep 2023 21:32:58 +0100 Subject: [PATCH 24/53] add tag variable --- .github/workflows/dockerimage.yml | 11 +++++++---- README.md | 25 +++++++++---------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index b47d996..d8f9372 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -6,6 +6,9 @@ on: pull_request: branches: [master] +env: + IMAGE_TAG: latest + jobs: commons: runs-on: ubuntu-latest @@ -21,7 +24,7 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/commons/. - tags: ghcr.io/nolte/vscode-devcontainers/commons + tags: ghcr.io/nolte/vscode-devcontainers/commons:$IMAGE_TAG outputs: type=docker,dest=/tmp/commons.tar - name: Upload artifact uses: actions/upload-artifact@v3 @@ -60,7 +63,7 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/devops/. - tags: ghcr.io/nolte/vscode-devcontainers/devops + tags: ghcr.io/nolte/vscode-devcontainers/devops:$IMAGE_TAG commonsgolang: runs-on: ubuntu-latest @@ -83,7 +86,7 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/commons-golang/. - tags: ghcr.io/nolte/vscode-devcontainers/commons-golang + tags: ghcr.io/nolte/vscode-devcontainers/commons-golang:$IMAGE_TAG outputs: type=docker,dest=/tmp/commons-golang.tar - name: Upload artifact @@ -113,4 +116,4 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/python/. - tags: ghcr.io/nolte/vscode-devcontainers/python \ No newline at end of file + tags: ghcr.io/nolte/vscode-devcontainers/python:$IMAGE_TAG \ No newline at end of file diff --git a/README.md b/README.md index f775cd8..26904e3 100644 --- a/README.md +++ b/README.md @@ -32,30 +32,23 @@ For build the images localy use the ``Makefile`` with ``make build`` and trink a | *image* (*project_type*) | *base on* | *description* | |---------------------------------------------------------------------------------|------------------------------------|---------------| -| ```docker.pkg.github.com/nolte/vscode-devcontainers/commons``` _(default)_ | | | -| ```docker.pkg.github.com/nolte/vscode-devcontainers/devops``` _(devops)_ | ```vscode-devcontainers/commons``` | | -| ```docker.pkg.github.com/nolte/vscode-devcontainers/python``` _(python)_ | ```vscode-devcontainers/commons``` | | -| ```docker.pkg.github.com/nolte/vscode-devcontainers/golang``` _(golang)_ | ```vscode-devcontainers/commons``` | | -| ```docker.pkg.github.com/nolte/vscode-devcontainers/k8s-operator``` _(default)_ | ```vscode-devcontainers/golang``` | | -| ```docker.pkg.github.com/nolte/vscode-devcontainers/npm``` _(npm)_ | ```vscode-devcontainers/commons``` | | -| ```docker.pkg.github.com/nolte/vscode-devcontainers/iot``` _(iot)_ | ```vscode-devcontainers/commons``` | | +| ```ghcr.io/nolte/vscode-devcontainers/commons``` _(default)_ | | | +| ```ghcr.io/nolte/vscode-devcontainers/devops``` _(devops)_ | ```vscode-devcontainers/commons``` | | +| ```ghcr.io/nolte/vscode-devcontainers/python``` _(python)_ | ```vscode-devcontainers/commons``` | | +| ```ghcr.io/nolte/vscode-devcontainers/golang``` _(golang)_ | ```vscode-devcontainers/commons``` | | +| ```ghcr.io/nolte/vscode-devcontainers/k8s-operator``` _(default)_ | ```vscode-devcontainers/golang``` | | +| ```ghcr.io/nolte/vscode-devcontainers/npm``` _(npm)_ | ```vscode-devcontainers/commons``` | | +| ```ghcr.io/nolte/vscode-devcontainers/iot``` _(iot)_ | ```vscode-devcontainers/commons``` | | ... sorry but at the moment the Pulic Github Docker Repoisitory is not realy public like [hub.docker.com]. see ([github.community](https://github.community/t5/GitHub-Actions/docker-pull-from-public-GitHub-Package-Registry-fail-with-quot/td-p/32782)) ```bash -pass internet/github.com/nolte/package_management_token | docker login docker.pkg.github.com --username nolte --password-stdin +pass internet/github.com/nolte/package_management_token | docker login ghcr.io --username nolte --password-stdin ``` ### Basement Env ### DevOps Env -Installed tools like [terraform](),[helm](),[kubectl](),[ansible]() and many more. - -#### Extra Terraform Providers - -* [terraform-provider-keycloak](https://github.com/mrparkers/terraform-provider-keycloak) -* [terraform-provider-minio](https://github.com/aminueza/terraform-provider-minio) -* [terraform-provider-kubectl](https://github.com/gavinbunney/terraform-provider-kubectl) -* [terraform-harbor-provider](https://github.com/BESTSELLER/terraform-harbor-provider) +This env will be configured by the [twpayne/chezmoi](https://github.com/twpayne/chezmoi) based Configuration scripts, [nolte/workstation](https://github.com/nolte/workstation). From 036a2ba4ad9e4c2f0240c12f20a553c7eb10d6ca Mon Sep 17 00:00:00 2001 From: nolte Date: Fri, 29 Sep 2023 21:37:40 +0100 Subject: [PATCH 25/53] add build args --- .github/workflows/dockerimage.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index d8f9372..db1972a 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -64,6 +64,7 @@ jobs: with: context: ./images/devops/. tags: ghcr.io/nolte/vscode-devcontainers/devops:$IMAGE_TAG + build-args: FROM_IMAGE_VERSION=$IMAGE_TAG commonsgolang: runs-on: ubuntu-latest @@ -88,6 +89,7 @@ jobs: context: ./images/commons-golang/. tags: ghcr.io/nolte/vscode-devcontainers/commons-golang:$IMAGE_TAG outputs: type=docker,dest=/tmp/commons-golang.tar + build-args: FROM_IMAGE_VERSION=$IMAGE_TAG - name: Upload artifact uses: actions/upload-artifact@v3 @@ -116,4 +118,5 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/python/. - tags: ghcr.io/nolte/vscode-devcontainers/python:$IMAGE_TAG \ No newline at end of file + tags: ghcr.io/nolte/vscode-devcontainers/python:$IMAGE_TAG + build-args: FROM_IMAGE_VERSION=$IMAGE_TAG \ No newline at end of file From adfe02a9b707ed8a151eb602ca79de528e3b942b Mon Sep 17 00:00:00 2001 From: nolte Date: Fri, 29 Sep 2023 21:43:38 +0100 Subject: [PATCH 26/53] try ... --- .github/workflows/dockerimage.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index db1972a..4dde710 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -24,7 +24,7 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/commons/. - tags: ghcr.io/nolte/vscode-devcontainers/commons:$IMAGE_TAG + tags: ghcr.io/nolte/vscode-devcontainers/commons:${{ env.IMAGE_TAG }} outputs: type=docker,dest=/tmp/commons.tar - name: Upload artifact uses: actions/upload-artifact@v3 @@ -63,7 +63,7 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/devops/. - tags: ghcr.io/nolte/vscode-devcontainers/devops:$IMAGE_TAG + tags: ghcr.io/nolte/vscode-devcontainers/devops:${{ env.IMAGE_TAG }} build-args: FROM_IMAGE_VERSION=$IMAGE_TAG commonsgolang: @@ -87,7 +87,7 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/commons-golang/. - tags: ghcr.io/nolte/vscode-devcontainers/commons-golang:$IMAGE_TAG + tags: ghcr.io/nolte/vscode-devcontainers/commons-golang:${{ env.IMAGE_TAG }} outputs: type=docker,dest=/tmp/commons-golang.tar build-args: FROM_IMAGE_VERSION=$IMAGE_TAG @@ -118,5 +118,5 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/python/. - tags: ghcr.io/nolte/vscode-devcontainers/python:$IMAGE_TAG + tags: ghcr.io/nolte/vscode-devcontainers/python:${{ env.IMAGE_TAG }} build-args: FROM_IMAGE_VERSION=$IMAGE_TAG \ No newline at end of file From 93e40720c14a70bc2ae342cf21612ca0c176cb47 Mon Sep 17 00:00:00 2001 From: nolte Date: Fri, 29 Sep 2023 21:48:42 +0100 Subject: [PATCH 27/53] env --- .github/workflows/dockerimage.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 4dde710..a6c306b 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -64,7 +64,7 @@ jobs: with: context: ./images/devops/. tags: ghcr.io/nolte/vscode-devcontainers/devops:${{ env.IMAGE_TAG }} - build-args: FROM_IMAGE_VERSION=$IMAGE_TAG + build-args: FROM_IMAGE_VERSION=${{ env.IMAGE_TAG }} commonsgolang: runs-on: ubuntu-latest @@ -89,7 +89,7 @@ jobs: context: ./images/commons-golang/. tags: ghcr.io/nolte/vscode-devcontainers/commons-golang:${{ env.IMAGE_TAG }} outputs: type=docker,dest=/tmp/commons-golang.tar - build-args: FROM_IMAGE_VERSION=$IMAGE_TAG + build-args: FROM_IMAGE_VERSION=${{ env.IMAGE_TAG }} - name: Upload artifact uses: actions/upload-artifact@v3 @@ -119,4 +119,4 @@ jobs: with: context: ./images/python/. tags: ghcr.io/nolte/vscode-devcontainers/python:${{ env.IMAGE_TAG }} - build-args: FROM_IMAGE_VERSION=$IMAGE_TAG \ No newline at end of file + build-args: FROM_IMAGE_VERSION=${{ env.IMAGE_TAG }} \ No newline at end of file From c98ecc8599bff697bd35c900aa20a193ff70991f Mon Sep 17 00:00:00 2001 From: nolte Date: Fri, 29 Sep 2023 22:38:32 +0100 Subject: [PATCH 28/53] add generated tag --- .github/workflows/dockerimage.yml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index a6c306b..1bd62cf 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -10,8 +10,21 @@ env: IMAGE_TAG: latest jobs: + prepare: + runs-on: ubuntu-latest + steps: + - id: env-setup + run: | + { + "image_tag=latest" + "push=false" + } >> $GITHUB_OUTPUT + outputs: + image_tag: ${{ steps.env-setup.outputs.image_tag }} + commons: runs-on: ubuntu-latest + needs: prepare steps: - name: Checkout uses: actions/checkout@v4 @@ -24,7 +37,7 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/commons/. - tags: ghcr.io/nolte/vscode-devcontainers/commons:${{ env.IMAGE_TAG }} + tags: ghcr.io/nolte/vscode-devcontainers/commons:${{ needs.prepare.outputs.image_tag }} outputs: type=docker,dest=/tmp/commons.tar - name: Upload artifact uses: actions/upload-artifact@v3 @@ -32,8 +45,7 @@ jobs: name: commons path: /tmp/commons.tar - outputs: - digest: ${{ steps.build.outputs.digest }} + devops: runs-on: ubuntu-latest @@ -63,8 +75,8 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/devops/. - tags: ghcr.io/nolte/vscode-devcontainers/devops:${{ env.IMAGE_TAG }} - build-args: FROM_IMAGE_VERSION=${{ env.IMAGE_TAG }} + tags: ghcr.io/nolte/vscode-devcontainers/devops:${{ needs.prepare.outputs.image_tag }} + build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} commonsgolang: runs-on: ubuntu-latest @@ -87,9 +99,9 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/commons-golang/. - tags: ghcr.io/nolte/vscode-devcontainers/commons-golang:${{ env.IMAGE_TAG }} + tags: ghcr.io/nolte/vscode-devcontainers/commons-golang:${{ needs.prepare.outputs.image_tag }} outputs: type=docker,dest=/tmp/commons-golang.tar - build-args: FROM_IMAGE_VERSION=${{ env.IMAGE_TAG }} + build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} - name: Upload artifact uses: actions/upload-artifact@v3 @@ -118,5 +130,5 @@ jobs: uses: docker/build-push-action@v5.0.0 with: context: ./images/python/. - tags: ghcr.io/nolte/vscode-devcontainers/python:${{ env.IMAGE_TAG }} - build-args: FROM_IMAGE_VERSION=${{ env.IMAGE_TAG }} \ No newline at end of file + tags: ghcr.io/nolte/vscode-devcontainers/python:${{ needs.prepare.outputs.image_tag }} + build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} \ No newline at end of file From b654a18dfc2a2821b0d2b4712cfc2d97350a55a3 Mon Sep 17 00:00:00 2001 From: nolte Date: Fri, 29 Sep 2023 22:46:25 +0100 Subject: [PATCH 29/53] echo --- .github/workflows/dockerimage.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 1bd62cf..95966ec 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -15,10 +15,7 @@ jobs: steps: - id: env-setup run: | - { - "image_tag=latest" - "push=false" - } >> $GITHUB_OUTPUT + echo "image_tag=latest" >> $GITHUB_OUTPUT outputs: image_tag: ${{ steps.env-setup.outputs.image_tag }} From d8e0fbc4aeec7a1c3491cd087bb16e775c15dd13 Mon Sep 17 00:00:00 2001 From: nolte Date: Fri, 29 Sep 2023 22:58:07 +0100 Subject: [PATCH 30/53] needs --- .github/workflows/dockerimage.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 95966ec..2630c37 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -46,7 +46,7 @@ jobs: devops: runs-on: ubuntu-latest - needs: commons + needs: [commons,prepare] steps: - name: Checkout uses: actions/checkout@v4 @@ -77,7 +77,7 @@ jobs: commonsgolang: runs-on: ubuntu-latest - needs: commons + needs: [commons,prepare] steps: - name: Checkout uses: actions/checkout@v4 @@ -108,7 +108,7 @@ jobs: python: runs-on: ubuntu-latest - needs: commonsgolang + needs: [commonsgolang,prepare] steps: - name: Checkout uses: actions/checkout@v4 From c0cbbaf02a287081baa2cad81c45bda30770470f Mon Sep 17 00:00:00 2001 From: nolte Date: Fri, 29 Sep 2023 23:11:21 +0100 Subject: [PATCH 31/53] use ref var --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 2630c37..69ce7ac 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -15,7 +15,7 @@ jobs: steps: - id: env-setup run: | - echo "image_tag=latest" >> $GITHUB_OUTPUT + echo "image_tag=${{ github.GITHUB_REF_NAME }}" >> $GITHUB_OUTPUT outputs: image_tag: ${{ steps.env-setup.outputs.image_tag }} From 4c9fb15c2e9278984f3d03b9122f80e4b7932383 Mon Sep 17 00:00:00 2001 From: nolte Date: Fri, 29 Sep 2023 23:13:31 +0100 Subject: [PATCH 32/53] ref --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 69ce7ac..48e3576 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -15,7 +15,7 @@ jobs: steps: - id: env-setup run: | - echo "image_tag=${{ github.GITHUB_REF_NAME }}" >> $GITHUB_OUTPUT + echo "image_tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT outputs: image_tag: ${{ steps.env-setup.outputs.image_tag }} From 2b9c8d880b82c3c5ce6203a7297d1ffd324b9c5f Mon Sep 17 00:00:00 2001 From: nolte Date: Fri, 29 Sep 2023 23:17:48 +0100 Subject: [PATCH 33/53] da --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 48e3576..f0e18f2 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -15,7 +15,7 @@ jobs: steps: - id: env-setup run: | - echo "image_tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT + echo "image_tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT outputs: image_tag: ${{ steps.env-setup.outputs.image_tag }} From c6387f1f5b0319d8fffd8c5121b5d1c5b425f8c7 Mon Sep 17 00:00:00 2001 From: nolte Date: Fri, 29 Sep 2023 23:26:35 +0100 Subject: [PATCH 34/53] replace --- .github/workflows/dockerimage.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index f0e18f2..23eea3b 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -15,7 +15,10 @@ jobs: steps: - id: env-setup run: | - echo "image_tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + export image_tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} + export image_tag=$(echo $image_tag | tr / -) + + echo "image_tag=$image_tag" >> $GITHUB_OUTPUT outputs: image_tag: ${{ steps.env-setup.outputs.image_tag }} From 590e0d0170de6783e736f65bbd2edc6ada8f2110 Mon Sep 17 00:00:00 2001 From: nolte Date: Fri, 29 Sep 2023 23:42:51 +0100 Subject: [PATCH 35/53] debug --- .github/workflows/dockerimage.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 23eea3b..bddb3b9 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -6,8 +6,6 @@ on: pull_request: branches: [master] -env: - IMAGE_TAG: latest jobs: prepare: @@ -69,6 +67,9 @@ jobs: path: /tmp - name: Load image run: | + echo "Tag" + echo ${{ needs.prepare.outputs.image_tag }} + echo "---" docker load --input /tmp/commons.tar - name: Push to GitHub Packages From 0bba1dd55683be8458ce3a5b3e10b1e94b14b579 Mon Sep 17 00:00:00 2001 From: nolte Date: Fri, 29 Sep 2023 23:50:15 +0100 Subject: [PATCH 36/53] debug --- .github/workflows/dockerimage.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index bddb3b9..e39223d 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -71,6 +71,10 @@ jobs: echo ${{ needs.prepare.outputs.image_tag }} echo "---" docker load --input /tmp/commons.tar + echo "---" + docker image ls -a + echo "---" + - name: Push to GitHub Packages uses: docker/build-push-action@v5.0.0 From 832bd6b61fee7174c5e3c6fad035c78e1a57a3ab Mon Sep 17 00:00:00 2001 From: nolte Date: Sat, 30 Sep 2023 00:00:54 +0100 Subject: [PATCH 37/53] ,,, --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index e39223d..0c281a9 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -81,7 +81,7 @@ jobs: with: context: ./images/devops/. tags: ghcr.io/nolte/vscode-devcontainers/devops:${{ needs.prepare.outputs.image_tag }} - build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} + build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }}u commonsgolang: runs-on: ubuntu-latest From 3eeb4c616289fc33d2f87d71bd8ecee2a184afcf Mon Sep 17 00:00:00 2001 From: nolte Date: Sat, 30 Sep 2023 15:57:33 +0100 Subject: [PATCH 38/53] with --- .github/workflows/dockerimage.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 0c281a9..d48452f 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -28,6 +28,8 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + with: + driver: docker #- name: Build the Docker image # run: docker build -f ./images/commons/Dockerfile -t vscode-commons:$(date +%s) ./images/commons/. - id: build @@ -60,6 +62,8 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + with: + driver: docker - name: Download artifact uses: actions/download-artifact@v3 with: @@ -91,6 +95,8 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + with: + driver: docker - name: Download artifact uses: actions/download-artifact@v3 with: @@ -122,6 +128,8 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + with: + driver: docker - name: Download artifact uses: actions/download-artifact@v3 with: From 4cb50da72f80acb30a46e4b2d03e09d66928b418 Mon Sep 17 00:00:00 2001 From: nolte Date: Sat, 30 Sep 2023 16:02:27 +0100 Subject: [PATCH 39/53] allow load --- .github/workflows/dockerimage.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index d48452f..a1605e2 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -27,9 +27,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - with: - driver: docker + uses: docker/setup-buildx-action@v3 #- name: Build the Docker image # run: docker build -f ./images/commons/Dockerfile -t vscode-commons:$(date +%s) ./images/commons/. - id: build @@ -62,8 +60,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - with: - driver: docker - name: Download artifact uses: actions/download-artifact@v3 with: @@ -83,6 +79,7 @@ jobs: - name: Push to GitHub Packages uses: docker/build-push-action@v5.0.0 with: + load: true context: ./images/devops/. tags: ghcr.io/nolte/vscode-devcontainers/devops:${{ needs.prepare.outputs.image_tag }} build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }}u @@ -94,9 +91,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - with: - driver: docker + uses: docker/setup-buildx-action@v3 - name: Download artifact uses: actions/download-artifact@v3 with: @@ -113,6 +108,8 @@ jobs: tags: ghcr.io/nolte/vscode-devcontainers/commons-golang:${{ needs.prepare.outputs.image_tag }} outputs: type=docker,dest=/tmp/commons-golang.tar build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} + load: true + - name: Upload artifact uses: actions/upload-artifact@v3 @@ -127,9 +124,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - with: - driver: docker + uses: docker/setup-buildx-action@v3 - name: Download artifact uses: actions/download-artifact@v3 with: @@ -144,4 +139,5 @@ jobs: with: context: ./images/python/. tags: ghcr.io/nolte/vscode-devcontainers/python:${{ needs.prepare.outputs.image_tag }} - build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} \ No newline at end of file + build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} + load: true From c65694dcba21b8b42e7ed839895b537972bfc7cc Mon Sep 17 00:00:00 2001 From: nolte Date: Sat, 30 Sep 2023 16:07:45 +0100 Subject: [PATCH 40/53] ... --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index a1605e2..4aac8df 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -82,7 +82,7 @@ jobs: load: true context: ./images/devops/. tags: ghcr.io/nolte/vscode-devcontainers/devops:${{ needs.prepare.outputs.image_tag }} - build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }}u + build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} commonsgolang: runs-on: ubuntu-latest From 80c811ecd27ebdf979b3ae38e7f437bbc6be8dc2 Mon Sep 17 00:00:00 2001 From: nolte Date: Sat, 30 Sep 2023 16:28:08 +0100 Subject: [PATCH 41/53] .... --- .github/workflows/dockerimage.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 4aac8df..387ae6a 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -37,6 +37,8 @@ jobs: context: ./images/commons/. tags: ghcr.io/nolte/vscode-devcontainers/commons:${{ needs.prepare.outputs.image_tag }} outputs: type=docker,dest=/tmp/commons.tar + load: true + pull: false - name: Upload artifact uses: actions/upload-artifact@v3 with: @@ -83,7 +85,7 @@ jobs: context: ./images/devops/. tags: ghcr.io/nolte/vscode-devcontainers/devops:${{ needs.prepare.outputs.image_tag }} build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} - + pull: false commonsgolang: runs-on: ubuntu-latest needs: [commons,prepare] @@ -109,7 +111,7 @@ jobs: outputs: type=docker,dest=/tmp/commons-golang.tar build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} load: true - + pull: false - name: Upload artifact uses: actions/upload-artifact@v3 @@ -141,3 +143,4 @@ jobs: tags: ghcr.io/nolte/vscode-devcontainers/python:${{ needs.prepare.outputs.image_tag }} build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} load: true + pull: false \ No newline at end of file From 8faac64f30a23b52766b40a49b1e2b1eb8d5162b Mon Sep 17 00:00:00 2001 From: nolte Date: Sat, 30 Sep 2023 16:36:31 +0100 Subject: [PATCH 42/53] driver docker --- .github/workflows/dockerimage.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 387ae6a..b68b5e5 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -27,7 +27,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v3 + with: + driver: docker #- name: Build the Docker image # run: docker build -f ./images/commons/Dockerfile -t vscode-commons:$(date +%s) ./images/commons/. - id: build @@ -62,6 +64,8 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + with: + driver: docker - name: Download artifact uses: actions/download-artifact@v3 with: @@ -69,6 +73,7 @@ jobs: path: /tmp - name: Load image run: | + # docker buildx use default echo "Tag" echo ${{ needs.prepare.outputs.image_tag }} echo "---" @@ -93,7 +98,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v3 + with: + driver: docker - name: Download artifact uses: actions/download-artifact@v3 with: @@ -126,7 +133,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v3 + with: + driver: docker - name: Download artifact uses: actions/download-artifact@v3 with: From 9d4f52768e008bcc35ce0c29ade676d53f959ff0 Mon Sep 17 00:00:00 2001 From: nolte Date: Sat, 30 Sep 2023 16:59:18 +0100 Subject: [PATCH 43/53] platform --- .github/workflows/dockerimage.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index b68b5e5..61e10f9 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -28,8 +28,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - with: - driver: docker + #- name: Build the Docker image # run: docker build -f ./images/commons/Dockerfile -t vscode-commons:$(date +%s) ./images/commons/. - id: build @@ -41,6 +40,8 @@ jobs: outputs: type=docker,dest=/tmp/commons.tar load: true pull: false + platforms: + - linux/amd64 - name: Upload artifact uses: actions/upload-artifact@v3 with: @@ -64,8 +65,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - with: - driver: docker + - name: Download artifact uses: actions/download-artifact@v3 with: @@ -91,6 +91,8 @@ jobs: tags: ghcr.io/nolte/vscode-devcontainers/devops:${{ needs.prepare.outputs.image_tag }} build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} pull: false + platforms: + - linux/amd64 commonsgolang: runs-on: ubuntu-latest needs: [commons,prepare] @@ -99,8 +101,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - with: - driver: docker + - name: Download artifact uses: actions/download-artifact@v3 with: @@ -119,7 +120,8 @@ jobs: build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} load: true pull: false - + platforms: + - linux/amd64 - name: Upload artifact uses: actions/upload-artifact@v3 with: @@ -134,8 +136,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - with: - driver: docker + - name: Download artifact uses: actions/download-artifact@v3 with: @@ -152,4 +153,6 @@ jobs: tags: ghcr.io/nolte/vscode-devcontainers/python:${{ needs.prepare.outputs.image_tag }} build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} load: true - pull: false \ No newline at end of file + pull: false + platforms: + - linux/amd64 \ No newline at end of file From 29f77f78f009bfcc71d90bfebb1a626c623caff0 Mon Sep 17 00:00:00 2001 From: nolte Date: Sat, 30 Sep 2023 17:02:20 +0100 Subject: [PATCH 44/53] ... --- .github/workflows/dockerimage.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 61e10f9..9cb04a7 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -40,8 +40,7 @@ jobs: outputs: type=docker,dest=/tmp/commons.tar load: true pull: false - platforms: - - linux/amd64 + platforms: linux/amd64 - name: Upload artifact uses: actions/upload-artifact@v3 with: @@ -91,8 +90,7 @@ jobs: tags: ghcr.io/nolte/vscode-devcontainers/devops:${{ needs.prepare.outputs.image_tag }} build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} pull: false - platforms: - - linux/amd64 + platforms: linux/amd64 commonsgolang: runs-on: ubuntu-latest needs: [commons,prepare] @@ -120,8 +118,7 @@ jobs: build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} load: true pull: false - platforms: - - linux/amd64 + platforms: linux/amd64 - name: Upload artifact uses: actions/upload-artifact@v3 with: @@ -154,5 +151,4 @@ jobs: build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} load: true pull: false - platforms: - - linux/amd64 \ No newline at end of file + platforms: linux/amd64 \ No newline at end of file From 836f66268c5daede7ec50851e0b59b9ac815d7bf Mon Sep 17 00:00:00 2001 From: nolte Date: Sat, 30 Sep 2023 17:10:51 +0100 Subject: [PATCH 45/53] push all --- .github/workflows/dockerimage.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 9cb04a7..842bb3b 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -39,8 +39,8 @@ jobs: tags: ghcr.io/nolte/vscode-devcontainers/commons:${{ needs.prepare.outputs.image_tag }} outputs: type=docker,dest=/tmp/commons.tar load: true - pull: false - platforms: linux/amd64 + + push: true - name: Upload artifact uses: actions/upload-artifact@v3 with: @@ -89,8 +89,8 @@ jobs: context: ./images/devops/. tags: ghcr.io/nolte/vscode-devcontainers/devops:${{ needs.prepare.outputs.image_tag }} build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} - pull: false - platforms: linux/amd64 + + push: true commonsgolang: runs-on: ubuntu-latest needs: [commons,prepare] @@ -117,8 +117,8 @@ jobs: outputs: type=docker,dest=/tmp/commons-golang.tar build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} load: true - pull: false - platforms: linux/amd64 + + push: true - name: Upload artifact uses: actions/upload-artifact@v3 with: @@ -150,5 +150,5 @@ jobs: tags: ghcr.io/nolte/vscode-devcontainers/python:${{ needs.prepare.outputs.image_tag }} build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} load: true - pull: false - platforms: linux/amd64 \ No newline at end of file + + push: true \ No newline at end of file From 7c0596c2278cf868c5ae64e8a8a68a52cdfc8ed4 Mon Sep 17 00:00:00 2001 From: nolte Date: Sat, 30 Sep 2023 17:18:50 +0100 Subject: [PATCH 46/53] ... --- .github/workflows/dockerimage.yml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 842bb3b..22f9325 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -28,7 +28,12 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} #- name: Build the Docker image # run: docker build -f ./images/commons/Dockerfile -t vscode-commons:$(date +%s) ./images/commons/. - id: build @@ -99,7 +104,12 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Download artifact uses: actions/download-artifact@v3 with: @@ -133,7 +143,12 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Download artifact uses: actions/download-artifact@v3 with: From 2d619e4f8b623ad352ba4ec99207728276d744b1 Mon Sep 17 00:00:00 2001 From: nolte Date: Sat, 30 Sep 2023 17:20:14 +0100 Subject: [PATCH 47/53] .. --- .github/workflows/dockerimage.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 22f9325..5aa17aa 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -43,7 +43,7 @@ jobs: context: ./images/commons/. tags: ghcr.io/nolte/vscode-devcontainers/commons:${{ needs.prepare.outputs.image_tag }} outputs: type=docker,dest=/tmp/commons.tar - load: true + push: true - name: Upload artifact @@ -90,7 +90,7 @@ jobs: - name: Push to GitHub Packages uses: docker/build-push-action@v5.0.0 with: - load: true + context: ./images/devops/. tags: ghcr.io/nolte/vscode-devcontainers/devops:${{ needs.prepare.outputs.image_tag }} build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} @@ -126,7 +126,7 @@ jobs: tags: ghcr.io/nolte/vscode-devcontainers/commons-golang:${{ needs.prepare.outputs.image_tag }} outputs: type=docker,dest=/tmp/commons-golang.tar build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} - load: true + push: true - name: Upload artifact @@ -164,6 +164,6 @@ jobs: context: ./images/python/. tags: ghcr.io/nolte/vscode-devcontainers/python:${{ needs.prepare.outputs.image_tag }} build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} - load: true + push: true \ No newline at end of file From df13790f10339719946df115e8acd3d584d6a608 Mon Sep 17 00:00:00 2001 From: nolte Date: Sat, 30 Sep 2023 17:22:41 +0100 Subject: [PATCH 48/53] ... --- .github/workflows/dockerimage.yml | 64 +++++++++++++++---------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 5aa17aa..77091b8 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -42,15 +42,15 @@ jobs: with: context: ./images/commons/. tags: ghcr.io/nolte/vscode-devcontainers/commons:${{ needs.prepare.outputs.image_tag }} - outputs: type=docker,dest=/tmp/commons.tar + # outputs: type=docker,dest=/tmp/commons.tar push: true - - name: Upload artifact - uses: actions/upload-artifact@v3 - with: - name: commons - path: /tmp/commons.tar + # - name: Upload artifact + # uses: actions/upload-artifact@v3 + # with: + # name: commons + # path: /tmp/commons.tar @@ -67,14 +67,14 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v3 - - name: Download artifact - uses: actions/download-artifact@v3 - with: - name: commons - path: /tmp + # - name: Download artifact + # uses: actions/download-artifact@v3 + # with: + # name: commons + # path: /tmp - name: Load image run: | # docker buildx use default @@ -110,24 +110,22 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Download artifact - uses: actions/download-artifact@v3 - with: - name: commons - path: /tmp - - name: Load image - run: | - docker load --input /tmp/commons.tar + # - name: Download artifact + # uses: actions/download-artifact@v3 + # with: + # name: commons + # path: /tmp + # - name: Load image + # run: | + # docker load --input /tmp/commons.tar - name: Push to GitHub Packages uses: docker/build-push-action@v5.0.0 with: context: ./images/commons-golang/. tags: ghcr.io/nolte/vscode-devcontainers/commons-golang:${{ needs.prepare.outputs.image_tag }} - outputs: type=docker,dest=/tmp/commons-golang.tar - build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} - - + #outputs: type=docker,dest=/tmp/commons-golang.tar + build-args: FROM_IMAGE_VERSION=${{ needs.prepare.outputs.image_tag }} push: true - name: Upload artifact uses: actions/upload-artifact@v3 @@ -149,14 +147,14 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Download artifact - uses: actions/download-artifact@v3 - with: - name: commons-golang - path: /tmp - - name: Load image - run: | - docker load --input /tmp/commons-golang.tar + # - name: Download artifact + # uses: actions/download-artifact@v3 + # with: + # name: commons-golang + # path: /tmp + # - name: Load image + # run: | + # docker load --input /tmp/commons-golang.tar - name: Push to GitHub Packages uses: docker/build-push-action@v5.0.0 From 991a77840ce2ea2801245950cece1dc0d4cc1173 Mon Sep 17 00:00:00 2001 From: nolte Date: Sat, 30 Sep 2023 17:26:31 +0100 Subject: [PATCH 49/53] disable --- .github/workflows/dockerimage.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 77091b8..37eba2c 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -75,16 +75,16 @@ jobs: # with: # name: commons # path: /tmp - - name: Load image - run: | - # docker buildx use default - echo "Tag" - echo ${{ needs.prepare.outputs.image_tag }} - echo "---" - docker load --input /tmp/commons.tar - echo "---" - docker image ls -a - echo "---" + # - name: Load image + # run: | + # # docker buildx use default + # echo "Tag" + # echo ${{ needs.prepare.outputs.image_tag }} + # echo "---" + # docker load --input /tmp/commons.tar + # echo "---" + # docker image ls -a + # echo "---" - name: Push to GitHub Packages From e234538f20c5c1aa4ba532797dfc85f9ea47916f Mon Sep 17 00:00:00 2001 From: nolte Date: Tue, 3 Oct 2023 11:35:24 +0100 Subject: [PATCH 50/53] try to delete --- .github/workflows/cleanup.yaml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/cleanup.yaml diff --git a/.github/workflows/cleanup.yaml b/.github/workflows/cleanup.yaml new file mode 100644 index 0000000..959803d --- /dev/null +++ b/.github/workflows/cleanup.yaml @@ -0,0 +1,30 @@ +name: Branch Deleted + +#on: delete + +on: + push: + branches: ["feature/bump-up", "master"] + pull_request: + branches: [master] + +jobs: + delete: + # if: github.event.ref_type == 'branch' + runs-on: ubuntu-latest + steps: + - id: env-setup + run: | + export image_tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} + export image_tag=$(echo $image_tag | tr / -) + + echo "image_tag=$image_tag" >> $GITHUB_OUTPUT + - name: Delete image + uses: bots-house/ghcr-delete-image-action@v1.1.0 + with: + # NOTE: at now only orgs is supported + owner: ${{ github.actor }} + name: commons + # NOTE: using Personal Access Token + token: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ steps.env-setup.outputs.image_tag }} \ No newline at end of file From 9c3df9ba411a69bd56e299ec3facd5b583c129fa Mon Sep 17 00:00:00 2001 From: nolte Date: Tue, 3 Oct 2023 11:39:56 +0100 Subject: [PATCH 51/53] cleanup --- .github/workflows/cleanup.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cleanup.yaml b/.github/workflows/cleanup.yaml index 959803d..ffe5671 100644 --- a/.github/workflows/cleanup.yaml +++ b/.github/workflows/cleanup.yaml @@ -24,7 +24,7 @@ jobs: with: # NOTE: at now only orgs is supported owner: ${{ github.actor }} - name: commons + name: vscode-devcontainers/commons # NOTE: using Personal Access Token token: ${{ secrets.GITHUB_TOKEN }} tag: ${{ steps.env-setup.outputs.image_tag }} \ No newline at end of file From 0311cd766d77dcadd125d972d93d8ee781d1f0b9 Mon Sep 17 00:00:00 2001 From: nolte Date: Tue, 3 Oct 2023 11:46:44 +0100 Subject: [PATCH 52/53] change --- .github/workflows/cleanup.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cleanup.yaml b/.github/workflows/cleanup.yaml index ffe5671..dbb0149 100644 --- a/.github/workflows/cleanup.yaml +++ b/.github/workflows/cleanup.yaml @@ -20,11 +20,12 @@ jobs: echo "image_tag=$image_tag" >> $GITHUB_OUTPUT - name: Delete image - uses: bots-house/ghcr-delete-image-action@v1.1.0 + uses: lazyfrosch/ghcr-delete-image-action@main with: # NOTE: at now only orgs is supported owner: ${{ github.actor }} name: vscode-devcontainers/commons + is_user: true # NOTE: using Personal Access Token token: ${{ secrets.GITHUB_TOKEN }} tag: ${{ steps.env-setup.outputs.image_tag }} \ No newline at end of file From b7cd3274139f1851b8094500181ec394e5d51104 Mon Sep 17 00:00:00 2001 From: nolte Date: Tue, 3 Oct 2023 11:53:12 +0100 Subject: [PATCH 53/53] matrix --- .github/workflows/cleanup.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cleanup.yaml b/.github/workflows/cleanup.yaml index dbb0149..f2aeadd 100644 --- a/.github/workflows/cleanup.yaml +++ b/.github/workflows/cleanup.yaml @@ -10,6 +10,14 @@ on: jobs: delete: + strategy: + matrix: + image: + - vscode-devcontainers/commons + - vscode-devcontainers/devops + - vscode-devcontainers/python + - vscode-devcontainers/commons-golang + # if: github.event.ref_type == 'branch' runs-on: ubuntu-latest steps: @@ -21,10 +29,11 @@ jobs: echo "image_tag=$image_tag" >> $GITHUB_OUTPUT - name: Delete image uses: lazyfrosch/ghcr-delete-image-action@main + continue-on-error: true with: # NOTE: at now only orgs is supported owner: ${{ github.actor }} - name: vscode-devcontainers/commons + name: ${{ matrix.image }} is_user: true # NOTE: using Personal Access Token token: ${{ secrets.GITHUB_TOKEN }}