From 408c3b01f9897beb088a088917929985c3eb740d Mon Sep 17 00:00:00 2001 From: d-eigo-hara Date: Wed, 18 Dec 2024 06:08:56 +0000 Subject: [PATCH 1/3] add: MacOS --- .gitignore | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) 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/* From 9ac6618b3591a37fcc16f6948b637339cbbe5e38 Mon Sep 17 00:00:00 2001 From: d-eigo-hara Date: Wed, 18 Dec 2024 06:09:25 +0000 Subject: [PATCH 2/3] fix: Dockerfile for permissions --- .devcontainer/Dockerfile | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) 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 From fea485ff079f7d267ff4320dd2514d9b9c3df204 Mon Sep 17 00:00:00 2001 From: d-eigo-hara Date: Wed, 18 Dec 2024 06:11:22 +0000 Subject: [PATCH 3/3] delete: .DS_Store --- assets/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 assets/.DS_Store diff --git a/assets/.DS_Store b/assets/.DS_Store deleted file mode 100644 index bd8a617640f8204ccde1923b05a0c66904f32b44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKO-|!56t>$!6CtE7V1y70OGvDWXlY@D*o0CpKwwxfqtcMlMx=4oAF`;5asb$I z8V)c=n0s&lB;K=Krlqt92EBfv@Q0_;nYsCF*3K?uf4MCg zyZw59(5uwD=h!=uGW5pny7wb!#I@Ygp^Wy%t`7*A^LFD&Ttg8*S zZP~Tl>Tp=vDVFnM^ZQII}o03I?W4MQg z*-zLkx|g!8PvW<=)4!IstX9oQwVpQQ!}IO$gGsCZfwj|`992Nrc)lCA8-+4zf@Zur zw2}}5!~iicdkmOc%37GcrO}Fr0b<}kGl2JlfP&~4Of;&i11gmQ0A@g~1lpKOV2m*6 z7)&&R1%&HRKpo0Wiota_=!Nlf3?>?NIO8Vy;AUoSG8C?6hw+7SXWY?9H8DU8yk#J* zyE%OSkKWJ!-v&{S7$63|6azd{b*mNFl6hOFHivJmfN}u^1^p6@uOZM-Pciu7Q@jF2 a3Frkj03CygM$mxJkAR|qDq`SM8F&E>nq>R{