Skip to content

Commit 57f26d5

Browse files
committed
add another image
1 parent 438e125 commit 57f26d5

File tree

5 files changed

+33
-8
lines changed

5 files changed

+33
-8
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ install-node:
1717
install-hooks: install-python
1818
poetry run pre-commit install --install-hooks --overwrite
1919

20-
install-hooks:
2120
build-image: guard-CONTAINER_NAME
2221
npx devcontainer build \
2322
--workspace-folder ./src/$${CONTAINER_NAME}/ \

src/base/.devcontainer/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ COPY .tool-versions.asdf /home/vscode/.tool-versions.asdf
2222
COPY .tool-versions /home/vscode/.tool-versions
2323

2424
RUN ./vscode_install.sh
25+
WORKDIR /home/vscode

src/base/.devcontainer/scripts/vscode_install.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,10 @@ echo 'export GEM_HOME="$HOME/gems"' >> ~/.bashrc
1313
echo 'export PATH="$HOME/gems/bin:$PATH"' >> ~/.bashrc
1414

1515
# Install ASDF plugins
16-
asdf plugin add python
17-
asdf plugin add poetry https://github.com/asdf-community/asdf-poetry.git
1816
asdf plugin add shellcheck https://github.com/luizm/asdf-shellcheck.git
19-
asdf plugin add nodejs https://github.com/asdf-vm/asdf-nodejs.git
2017
asdf plugin add direnv
2118
asdf plugin add actionlint
2219
asdf plugin add ruby https://github.com/asdf-vm/asdf-ruby.git
23-
asdf plugin add java
24-
asdf plugin add maven
25-
asdf plugin add golang https://github.com/kennyp/asdf-golang.git
26-
asdf plugin add golangci-lint https://github.com/hypnoglow/asdf-golangci-lint.git
2720
asdf plugin add terraform https://github.com/asdf-community/asdf-hashicorp.git
2821
asdf plugin add trivy https://github.com/zufardhiyaulhaq/asdf-trivy.git
2922

src/common/Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
FROM ghcr.io/nhsdigital/eps-devcontainers/base:latest
2+
3+
# common Dockerfile used to setup poetry after installing python
4+
5+
ARG POETRY_VERSION=2.3.2
6+
7+
RUN curl -sSL https://install.python-poetry.org | python3 - --version ${POETRY_VERSION}
8+
9+
ENV PATH="/home/vscode/.local/bin:${PATH}"
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
3+
{
4+
"name": "EPS Devcontainer node_24 python_3.14",
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"build": {
7+
"dockerfile": "../../common/Dockerfile",
8+
"args": {}
9+
},
10+
"runArgs": [
11+
"--network=host"
12+
],
13+
"remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" },
14+
"features": {
15+
"ghcr.io/devcontainers/features/node:1": {
16+
"version": "24.13.1"
17+
},
18+
"ghcr.io/devcontainers/features/python:1": {
19+
"version": "3.14.3"
20+
}
21+
}
22+
}
23+

0 commit comments

Comments
 (0)