Skip to content

Commit bf01fe1

Browse files
authored
Update dev toolkit to version 2025.06 (#9)
1 parent 14075af commit bf01fe1

File tree

7 files changed

+72
-72
lines changed

7 files changed

+72
-72
lines changed

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ FROM ubuntu:24.10
22

33
ARG TARGETOS
44
ARG TARGETARCH
5-
ARG GO_VERSION=1.24.2
6-
ARG GOLANGCI_LINT_VERSION=v2.1.2
7-
ARG DOCKER_VERSION=28.0.4
8-
ARG DOCKER_COMPOSE_VERSION=2.35.0
5+
ARG GO_VERSION=1.24.4
6+
ARG GOLANGCI_LINT_VERSION=v2.1.6
7+
ARG DOCKER_VERSION=28.3.0
8+
ARG DOCKER_COMPOSE_VERSION=2.37.3
99
ARG NODE_VERSION=18.20.4
1010
ARG YARN_VERSION=1.22.22
1111

@@ -89,4 +89,4 @@ ENV GOROOT="/usr/local/go" \
8989

9090
# Inject a post-start.sh script that can be used via postStartCommand
9191
COPY post-start.sh /post-start.sh
92-
RUN chmod +x /post-start.sh
92+
RUN chmod +x /post-start.sh

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Note: these can be overriden on the command line e.g. `make VERSION=2025.04`
2-
VERSION=2025.04
1+
# Note: these can be overriden on the command line e.g. `make VERSION=2025.06`
2+
VERSION=2025.06
33

44
.PHONY: base-amd64 base-arm64 base alapenna
55

6-
base-amd64:
6+
base-amd64:
77
docker build --push --platform=linux/amd64 -t portainer/dev-toolkit:$(VERSION)-amd64 -f Dockerfile .
88

9-
base-arm64:
9+
base-arm64:
1010
docker build --push --platform=linux/arm64 -t portainer/dev-toolkit:$(VERSION)-arm64 -f Dockerfile .
1111

1212
# Note: buildx sucks for multi-arch: https://skyworkz.nl/blog/multi-arch-docker-image-10x-faster

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ See `Dockerfile` for more details.
2929

3030
The `portainer/dev-toolkit` image is using DockerHub automatic builds to build multi-arch (amd64, arm64) images based on this git repository tags.
3131

32-
E.g. creating and pushing a new `2025.04` tag in this repository will automatically build `portainer/dev-toolkit:2025.04`.
32+
E.g. creating and pushing a new `2025.06` tag in this repository will automatically build `portainer/dev-toolkit:2025.06`.
3333

34-
> **Warning**
34+
> **Warning**
3535
> The automatic builds are currently disabled. Reach out to @deviantony for building newer versions of the base image using manual instructions below.
3636
3737
# Manual build
@@ -47,7 +47,7 @@ make base
4747

4848
All you need to have installed is Docker.
4949

50-
The container image is distributed by Portainer via `portainer/dev-toolkit`, checkout DockerHub for more details on the tags/versions: https://hub.docker.com/repository/docker/portainer/dev-toolkit/tags?page=1&ordering=last_updated
50+
The container image is distributed by Portainer via `portainer/dev-toolkit`, checkout DockerHub for more details on the tags/versions: https://hub.docker.com/repository/docker/portainer/dev-toolkit/tags?page=1&ordering=last_updated
5151

5252
# How to use it
5353

@@ -69,7 +69,7 @@ All you will need is to build it first:
6969
docker buildx build -t my-devkit -f examples/zsh/Dockerfile .
7070
```
7171

72-
Then you can use the instructions above to run it, just replace the official `portainer/dev-toolkit:2025.04` with your image in the `devcontainer.json` file:
72+
Then you can use the instructions above to run it, just replace the official `portainer/dev-toolkit:2025.06` with your image in the `devcontainer.json` file:
7373

7474
```json
7575
{

devcontainer.json

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
22
// README at: https://github.com/devcontainers/templates/tree/main/src/go
33
{
4-
"name": "portainer-dev-toolkit",
5-
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "portainer/dev-toolkit:2025.04",
7-
8-
// Features to add to the dev container. More info: https://containers.dev/features.
9-
// "features": {},
10-
11-
// Script that can be executed once the container is started.
12-
"postStartCommand": "/post-start.sh",
13-
14-
// Use 'forwardPorts' to make a list of ports inside the container available over localhost (localhost only).
15-
"forwardPorts": [8000, 8999, 9000, 9443],
16-
17-
// Use the 'appPort' field to define ports in the format "hostPort:containerPort".
18-
// This is useful for exposing specific container ports on the host network.
19-
// Specify ports here if your services need to be accessible via the host IP.
20-
"appPort": [],
21-
22-
// Use 'postCreateCommand' to run commands after the container is created.
23-
// "postCreateCommand": "go version",
24-
25-
// Use 'mounts' to mount host directories and volumes into the container.
26-
"mounts": [
27-
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
28-
],
29-
30-
// Configure tool-specific properties.
31-
"customizations": {
32-
"vscode": {
33-
"extensions": [
34-
"ms-vscode.makefile-tools",
35-
"ms-azuretools.vscode-docker",
36-
"golang.Go"
37-
]
38-
}
39-
},
40-
41-
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
42-
"remoteUser": "root"
4+
"name": "portainer-dev-toolkit",
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "portainer/dev-toolkit:2025.06",
7+
8+
// Features to add to the dev container. More info: https://containers.dev/features.
9+
// "features": {},
10+
11+
// Script that can be executed once the container is started.
12+
"postStartCommand": "/post-start.sh",
13+
14+
// Use 'forwardPorts' to make a list of ports inside the container available over localhost (localhost only).
15+
"forwardPorts": [8000, 8999, 9000, 9443],
16+
17+
// Use the 'appPort' field to define ports in the format "hostPort:containerPort".
18+
// This is useful for exposing specific container ports on the host network.
19+
// Specify ports here if your services need to be accessible via the host IP.
20+
"appPort": [],
21+
22+
// Use 'postCreateCommand' to run commands after the container is created.
23+
// "postCreateCommand": "go version",
24+
25+
// Use 'mounts' to mount host directories and volumes into the container.
26+
"mounts": [
27+
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
28+
],
29+
30+
// Configure tool-specific properties.
31+
"customizations": {
32+
"vscode": {
33+
"extensions": [
34+
"ms-vscode.makefile-tools",
35+
"ms-azuretools.vscode-docker",
36+
"golang.Go"
37+
]
38+
}
39+
},
40+
41+
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
42+
"remoteUser": "root"
4343
}
Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"name": "portainer-dev-toolkit",
3-
"image": "portainer/dev-toolkit:2025.04",
4-
"forwardPorts": [8000, 8999, 9000, 9443],
5-
"mounts": [
6-
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
7-
],
8-
"customizations": {
9-
"vscode": {
10-
"extensions": [
11-
"ms-vscode.makefile-tools",
12-
"ms-azuretools.vscode-docker",
13-
"golang.Go",
14-
"ms-python.python"
15-
]
16-
}
17-
},
18-
"remoteUser": "root"
2+
"name": "portainer-dev-toolkit",
3+
"image": "portainer/dev-toolkit:2025.06",
4+
"forwardPorts": [8000, 8999, 9000, 9443],
5+
"mounts": [
6+
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
7+
],
8+
"customizations": {
9+
"vscode": {
10+
"extensions": [
11+
"ms-vscode.makefile-tools",
12+
"ms-azuretools.vscode-docker",
13+
"golang.Go",
14+
"ms-python.python"
15+
]
16+
}
17+
},
18+
"remoteUser": "root"
1919
}

examples/zsh/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM portainer/dev-toolkit:2025.04
1+
FROM portainer/dev-toolkit:2025.06
22

33
ENV HOME=/root
44

user-toolkits/alapenna/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM portainer/dev-toolkit:2025.04
1+
FROM portainer/dev-toolkit:2025.06
22

33
# Create a specific folder for Git configurations
44
RUN mkdir -p /root/.config/git
@@ -39,4 +39,4 @@ RUN curl -L https://github.com/protocolbuffers/protobuf/releases/download/v29.3/
3939
unzip /tmp/protoc.zip -d /root/.local
4040

4141
# Update .zshrc
42-
RUN echo 'export PATH="$PATH:/root/.local/bin"' >> /root/.zshrc
42+
RUN echo 'export PATH="$PATH:/root/.local/bin"' >> /root/.zshrc

0 commit comments

Comments
 (0)