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
27 changes: 16 additions & 11 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

FROM mcr.microsoft.com/devcontainers/java:1-21-bullseye

ARG ANDROID_PLATFORM=35
ARG ANDROID_BUILD_TOOLS=35.0.0
ARG ANDROID_PLATFORM=36
ARG ANDROID_BUILD_TOOLS=36.0.0
ARG CMDLINE_TOOLS_VERSION=11076708
ARG NODE_VERSION=22
ARG GRADLE_VERSION=8.11
Expand All @@ -18,9 +18,13 @@ ENV ANDROID_SDK_ROOT=/opt/android-sdk
ENV GRADLE_HOME=/opt/gradle
ENV PATH="${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${GRADLE_HOME}/bin"

# removes broken yarn repo present in base image
RUN rm -f /etc/apt/sources.list.d/yarn.list

RUN apt-get update && apt-get install -y --no-install-recommends \
wget \
unzip \
curl \
&& rm -rf /var/lib/apt/lists/*

# Install Gradle
Expand All @@ -30,15 +34,16 @@ RUN wget -q "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-
&& ln -s /opt/gradle-${GRADLE_VERSION} ${GRADLE_HOME}

# Install fnm and Node.js
ENV FNM_DIR=/usr/local/fnm
ENV PATH="${FNM_DIR}:${PATH}"
RUN curl -fsSL https://fnm.vercel.app/install | bash -s -- --install-dir "${FNM_DIR}" --skip-shell \
&& eval "$(${FNM_DIR}/fnm env)" \
&& fnm install ${NODE_VERSION} \
&& fnm default ${NODE_VERSION} \
&& npm install -g pnpm

ENV PATH="${FNM_DIR}/aliases/default/bin:${PATH}"
# Not required, mostly. When dev containers are used.
# ENV FNM_DIR=/usr/local/fnm
# ENV PATH="${FNM_DIR}:${PATH}"
# RUN curl -fsSL https://fnm.vercel.app/install | bash -s -- --install-dir "${FNM_DIR}" --skip-shell \
# && eval "$(${FNM_DIR}/fnm env)" \
# && fnm install ${NODE_VERSION} \
# && fnm default ${NODE_VERSION} \
# && npm install -g pnpm

# ENV PATH="${FNM_DIR}/aliases/default/bin:${PATH}"

# Install Android SDK
RUN mkdir -p ${ANDROID_HOME}/cmdline-tools \
Expand Down
28 changes: 14 additions & 14 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"name": "Acode Development",
"image": "mcr.microsoft.com/devcontainers/java:1-21-bullseye",
"build": {
"dockerfile": "Dockerfile"
},

"containerEnv": {
"JAVA_HOME": "/usr/local/openjdk-21"
},
"remoteEnv": {
"JAVA_HOME": "/usr/local/openjdk-21"
},

"features": {
"ghcr.io/devcontainers/features/java:1": {
"installGradle": true,
"installGroovy": false,
"installMaven": false,
"installAnt": false,
"version": "21",
"jdkDistro": "ms",
"gradleVersion": "latest"
},
"ghcr.io/nordcominc/devcontainer-features/android-sdk:1": {
"platform": "35",
"build_tools": "35.0.0"
"platform": "36",
"build_tools": "36.0.0"
},
"ghcr.io/devcontainers/features/node:1": {
"nodeGypDependencies": false,
Expand All @@ -24,9 +24,9 @@
"nvmVersion": "latest"
}
},

"overrideCommand": true,
"postCreateCommand": "pnpm run setup",

"remoteUser": "root",
"customizations": {
"vscode": {
"extensions": ["biomejs.biome", "redhat.java"],
Expand Down