Skip to content

Commit 9bbf852

Browse files
authored
Merge pull request #5 from JeffersonLab/dep-bump
Dep bump
2 parents e59a106 + 2af6539 commit 9bbf852

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

.devcontainer/dev.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@ services:
66
hostname: dev
77
container_name: dev
88
volumes:
9-
- /var/run/docker.sock:/var/run/docker.sock
9+
- /var/run/docker.sock:/var/run/docker.sock
10+
# For other containers to start under JetBrains IDEs (and possibly other devcontainer launchers)
11+
# depends_on:
12+
# - other-container

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
FROM ubuntu:jammy
1+
FROM ubuntu:noble
22

33
RUN cd /tmp \
44
&& apt update \
5-
&& apt install -y curl git vim openjdk-17-jdk zip unzip tini \
5+
&& apt install -y curl git vim openjdk-21-jdk zip unzip tini \
66
&& apt clean \
77
&& curl -o /usr/local/share/ca-certificates/customcert.crt http://pki.jlab.org/JLabCA.crt \
88
&& update-ca-certificates \
99
&& curl -O https://raw.githubusercontent.com/devcontainers/features/main/src/docker-outside-of-docker/install.sh \
1010
&& chmod +x /tmp/install.sh \
1111
&& /tmp/install.sh \
1212
&& curl -s "https://get.sdkman.io" | bash \
13-
&& bash -c "source /root/.sdkman/bin/sdkman-init.sh; sdk install gradle 7.4"
13+
&& bash -c "source /root/.sdkman/bin/sdkman-init.sh; sdk install gradle 9.3.0"
1414

1515
ENV TZ=America/New_York
1616
ENTRYPOINT ["/usr/bin/tini", "--"]

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
A Java [devcontainer](https://containers.dev/).
33

44
## Overview
5-
The 1.x version series is intended to use the following:
6-
- Java 17
7-
- Gradle 7.4
8-
- Ubuntu "jammy"
5+
The 2.x version series is intended to use the following:
6+
- Java 21
7+
- Gradle 9.3
8+
- Ubuntu "noble"
99
- [Docker outside of Docker](https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker) (sibling container). Use a bind mount of the form `/var/run/docker.sock:/var/run/docker.sock`. We don't use [Docker in Docker](https://github.com/devcontainers/features/tree/main/src/docker-in-docker), because it appears to be the [less good option](https://jpetazzo.github.io/2015/09/03/do-not-use-docker-in-docker-for-ci/).
1010

1111
## Quick Start with Compose

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.3
1+
2.0.0

0 commit comments

Comments
 (0)