Skip to content

Commit

Permalink
h2o 3.38.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
marevol committed Jan 9, 2023
1 parent c67d7f4 commit 36b62dd
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
17 changes: 12 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM adoptopenjdk:11-jdk-hotspot-focal as builder
FROM eclipse-temurin:11-jdk-focal as builder

ENV DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -30,13 +30,20 @@ RUN pip3 install -r h2o-3/h2o-py/test-requirements.txt && \

USER docker

ENV R_LIBS_USER=/build/h2o-3/Rlibrary

ADD h2o.patch .
RUN cd h2o-3 && \
git apply ../h2o.patch && \
WORKDIR /build/h2o-3
RUN git apply ../h2o.patch && \
echo "BUILD_NUMBER=$BUILD_NUMBER" > gradle/buildnumber.properties && \
./gradlew build -x test --debug --stacktrace
mkdir -p ${R_LIBS_USER} && \
./gradlew clean
RUN ./gradlew --parallel build \
-x test -x :h2o-r:buildPackageDocumentation \
--info --stacktrace


FROM adoptopenjdk:11-jdk-hotspot-focal
FROM eclipse-temurin:11-focal

LABEL maintainer "CodeLibs, Inc."

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ See [Packages](https://github.com/orgs/codelibs/packages/container/package/h2o).

## Docker Images

- [`3.36.1.2`](https://github.com/codelibs/docker-h2o/blob/master/Dockerfile)
- [`3.38.0.4`](https://github.com/codelibs/docker-h2o/blob/master/Dockerfile)

## Getting Started

You can access http://localhost:54321 from the host OS with:

```console
$ docker run -it -p 54321:54321 ghcr.io/codelibs/h2o:3.36.1.2
$ docker run -it -p 54321:54321 ghcr.io/codelibs/h2o:3.38.0.4
```

## Build
Expand All @@ -26,6 +26,6 @@ $ docker build --rm -t ghcr.io/codelibs/h2o:snapshot .
To build it on release tag,

```console
$ docker build --rm -t ghcr.io/codelibs/h2o:3.36.1.2 --build-arg GIT_BRANCH=jenkins-3.36.1.2 --build-arg BUILD_NUMBER=1 .
$ docker build --rm -t ghcr.io/codelibs/h2o:3.38.0.4 --build-arg GIT_BRANCH=jenkins-3.38.0.4 --build-arg BUILD_NUMBER=4 .
```

2 changes: 1 addition & 1 deletion h2o.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/h2o-core/build.gradle b/h2o-core/build.gradle
index 992c9654fe..62795094d7 100644
index 35fe0f9889..3793a6a79c 100644
--- a/h2o-core/build.gradle
+++ b/h2o-core/build.gradle
@@ -32,6 +32,8 @@ dependencies {
Expand Down

0 comments on commit 36b62dd

Please sign in to comment.