diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 82aeac5..d9b78b6 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -7,16 +7,20 @@ ARG TRIVY_VERSION=0.57.1 FROM ghcr.io/aquasecurity/trivy:$TRIVY_VERSION AS trivy -FROM $BASE_IMAGE:$PYTHON_VERSION-$DEBIAN_VERSION -COPY --from=trivy --chown=vscode: /usr/local/bin/trivy /usr/local/bin/trivy - -LABEL maintainer="a5chin " +FROM python:$PYTHON_VERSION-slim-$DEBIAN_VERSION AS builder ARG GCLOUD_SDK_VERSION=502.0.0 ARG TFENV_VERSION=v3.0.0 SHELL [ "/bin/bash", "-o", "pipefail", "-c" ] +# hadolint ignore=DL3008 +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl git \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + RUN if [ "$(uname -m)" = 'aarch64' ]; then _ARCH=arm; else _ARCH=x86_64; fi \ && curl -fsS "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-$GCLOUD_SDK_VERSION-linux-$_ARCH.tar.gz" \ | tar zx -C /opt \ @@ -27,5 +31,14 @@ RUN if [ "$(uname -m)" = 'aarch64' ]; then _ARCH=arm; else _ARCH=x86_64; fi \ RUN git clone --depth=1 -b $TFENV_VERSION https://github.com/tfutils/tfenv.git /opt/tfenv + +FROM $BASE_IMAGE:$PYTHON_VERSION-$DEBIAN_VERSION + +COPY --from=trivy --chown=vscode: /usr/local/bin/trivy /usr/local/bin/trivy +COPY --from=builder --chown=vscode: /opt/google-cloud-sdk /opt/google-cloud-sdk +COPY --from=builder --chown=vscode: /opt/tfenv /opt/tfenv + +LABEL maintainer="a5chin " + ENV PATH=$PATH:/opt/google-cloud-sdk/bin ENV PATH=$PATH:/opt/tfenv/bin diff --git a/.gitignore b/.gitignore index c7ca3fd..fc3885b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,31 @@ +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + # Local .terraform directories **/.terraform/* diff --git a/assets/.DS_Store b/assets/.DS_Store deleted file mode 100644 index bd8a617..0000000 Binary files a/assets/.DS_Store and /dev/null differ