Skip to content

Commit 4c87014

Browse files
chore(devcontainer): fix dockerfile broken yarn repo in base image
1 parent 6e9ca9e commit 4c87014

2 files changed

Lines changed: 17 additions & 13 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
FROM mcr.microsoft.com/devcontainers/java:1-21-bullseye
99

1010
ARG ANDROID_PLATFORM=35
11-
ARG ANDROID_BUILD_TOOLS=35.0.0
11+
ARG ANDROID_BUILD_TOOLS=36.0.0
1212
ARG CMDLINE_TOOLS_VERSION=11076708
1313
ARG NODE_VERSION=22
1414
ARG GRADLE_VERSION=8.11
@@ -18,9 +18,13 @@ ENV ANDROID_SDK_ROOT=/opt/android-sdk
1818
ENV GRADLE_HOME=/opt/gradle
1919
ENV PATH="${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${GRADLE_HOME}/bin"
2020

21+
# removes broken yarn repo present in base image
22+
RUN rm -f /etc/apt/sources.list.d/yarn.list
23+
2124
RUN apt-get update && apt-get install -y --no-install-recommends \
2225
wget \
2326
unzip \
27+
curl \
2428
&& rm -rf /var/lib/apt/lists/*
2529

2630
# Install Gradle

.devcontainer/devcontainer.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"name": "Acode Development",
3-
"image": "mcr.microsoft.com/devcontainers/java:1-21-bullseye",
3+
"build": {
4+
"dockerfile": "Dockerfile"
5+
},
6+
7+
"containerEnv": {
8+
"JAVA_HOME": "/usr/local/openjdk-21"
9+
},
10+
"remoteEnv": {
11+
"JAVA_HOME": "/usr/local/openjdk-21"
12+
},
413

514
"features": {
6-
"ghcr.io/devcontainers/features/java:1": {
7-
"installGradle": true,
8-
"installGroovy": false,
9-
"installMaven": false,
10-
"installAnt": false,
11-
"version": "21",
12-
"jdkDistro": "ms",
13-
"gradleVersion": "latest"
14-
},
1515
"ghcr.io/nordcominc/devcontainer-features/android-sdk:1": {
1616
"platform": "35",
1717
"build_tools": "35.0.0"
@@ -24,9 +24,9 @@
2424
"nvmVersion": "latest"
2525
}
2626
},
27-
27+
"overrideCommand": true,
2828
"postCreateCommand": "pnpm run setup",
29-
29+
"remoteUser": "root",
3030
"customizations": {
3131
"vscode": {
3232
"extensions": ["biomejs.biome", "redhat.java"],

0 commit comments

Comments
 (0)