Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion containers/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@ RUN set -eux; \
unzip -q /tmp/awscliv2.zip -d /tmp; \
/tmp/aws/install; \
rm -rf /tmp/awscliv2.zip /tmp/aws; \
# AWS Session Manager plugin
case "$(dpkg --print-architecture)" in \
amd64) ssm_arch="ubuntu_64bit" ;; \
arm64) ssm_arch="ubuntu_arm64" ;; \
*) echo "Unsupported architecture for session-manager-plugin: $(dpkg --print-architecture)" && exit 1 ;; \
esac; \
curl -fsSL "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/${ssm_arch}/session-manager-plugin.deb" -o /tmp/session-manager-plugin.deb; \
dpkg -i /tmp/session-manager-plugin.deb; \
rm -f /tmp/session-manager-plugin.deb; \
# gcloud SDK
arch="$(uname -m)"; \
case "${arch}" in \
Expand Down Expand Up @@ -100,7 +109,7 @@ RUN set -eux; \
ENV PATH="/root/.local/bin:/opt/google-cloud-sdk/bin:${PATH}"

# 確認
RUN gh --version && node --version && npm --version && aws --version && gcloud --version
RUN gh --version && node --version && npm --version && aws --version && gcloud --version && session-manager-plugin --version

# ユーザー設定
ARG USERNAME="ubuntu"
Expand Down
28 changes: 28 additions & 0 deletions containers/trygroup/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# ==================================
# devbase-trygroup: project-trygroup-prd / project-trygroup-prd-customer 専用環境
# devbase-base を継承し、Poetry と pnpm を追加
# ==================================

FROM devbase-base:latest

# --- root レイヤー: pnpm(npm グローバル) ---
USER root
RUN set -eux; \
npm i -g pnpm; \
npm cache clean --force; \
rm -rf /root/.npm

# --- user レイヤー: Poetry ---
# uv との競合回避:
# - Poetry は公式インストーラで独立した専用 venv に導入する(uv の管理環境に非干渉)
# - バイナリは ~/.local/bin/poetry、uv は ~/.local/bin/uv で名前衝突なし
# - Poetry の仮想環境は既定の ~/.cache/pypoetry に作成し、
# uv が使うプロジェクト直下の .venv と分離する(virtualenvs.in-project は false のまま)
USER ubuntu
RUN set -eux; \
curl -sSL https://install.python-poetry.org | python3 -; \
~/.local/bin/poetry --version; \
rm -rf ~/.cache/pypoetry/cache ~/.cache/pip

USER ubuntu
WORKDIR /work
Loading