Compare commits

..

No commits in common. "master" and "b99" have entirely different histories.
master ... b99

3 changed files with 11 additions and 45 deletions

View File

@ -1,49 +1,15 @@
FROM openjdk:8-jre-alpine FROM java:8-alpine
ARG WATERFALL_GIT_URL=https://github.com/WaterfallMC/Waterfall.git ARG WATERFALL_BUILD=99
ARG WATERFALL_VERSION=8ff8de0fbdbf14d0b3e842780738f6d0b204d07a ARG WATERFALL_URL=https://ci.destroystokyo.com/job/Waterfall/${WATERFALL_BUILD}/artifact/Waterfall-Proxy/bootstrap/target/Waterfall.jar
ARG WATERFALL_SHA512=bc184b728cda464d23abdb1975f8e696eb44f241bfc78cd15041240addf9bcdc0f2d21699d28746ff88147c5f4c7887c58c9446464762496f5857fa2b62ab620
ARG MAVEN_VERSION=3.3.9 WORKDIR /data
ADD "${WATERFALL_URL}" /srv/waterfall.jar
RUN cd /srv &&\
chmod 444 /srv/waterfall.jar
ARG WATERFALL_WORKSPACE=/usr/src/waterfall ADD start.sh /usr/local/bin/waterfall
# Dependencies that need to be permanently installed
RUN apk add --no-cache \
libc6-compat
# Building
RUN \
apk add --no-cache --virtual .build-deps \
bash \
git \
openjdk8="${JAVA_ALPINE_VERSION}" \
&&\
\
wget "http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz" &&\
tar -zxvf apache-maven-$MAVEN_VERSION-bin.tar.gz &&\
rm apache-maven-$MAVEN_VERSION-bin.tar.gz && \
mv apache-maven-$MAVEN_VERSION /usr/lib/mvn &&\
export MAVEN_HOME="/usr/lib/mvn" &&\
export PATH="${PATH}:${MAVEN_HOME}/bin" &&\
\
git config --global user.email "root@docker" &&\
git config --global user.name "Docker Build" &&\
git clone --recursive \
"${WATERFALL_GIT_URL}" "${WATERFALL_WORKSPACE}" &&\
\
cd "${WATERFALL_WORKSPACE}" &&\
git checkout "${WATERFALL_VERSION}" &&\
./build.sh &&\
rm -f Waterfall-Proxy/bootstrap/target/original-* &&\
mkdir -vp /srv &&\
chmod -v 444 Waterfall-Proxy/bootstrap/target/*.jar &&\
mv -v Waterfall-Proxy/bootstrap/target/*.jar /srv &&\
\
cd /srv &&\
rm -rf "${WATERFALL_WORKSPACE}" "${MAVEN_HOME}" &&\
apk del .build-deps
COPY start.sh /usr/local/bin/waterfall
RUN chmod +x /usr/local/bin/waterfall RUN chmod +x /usr/local/bin/waterfall
ENV JAVA_ARGS "-Xmx1G" ENV JAVA_ARGS "-Xmx1G"

View File

@ -6,7 +6,7 @@ This image includes the [Jenkins build of Waterfall](), "a drag and drop replace
All available tags are always listed [in Docker Hub](https://hub.docker.com/r/icedream/waterfall/tags), the list below explains the maintained tags: All available tags are always listed [in Docker Hub](https://hub.docker.com/r/icedream/waterfall/tags), the list below explains the maintained tags:
- `latest`, `b103`: Latest version of Waterfall. - `latest`, `b99`: Latest version of Waterfall.
Previous builds may also be available as tags in the format `b<number>`, for Previous builds may also be available as tags in the format `b<number>`, for
example `b75`. example `b75`.

View File

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
exec java $JAVA_ARGS -jar /srv/Waterfall.jar $WATERFALL_ARGS exec java $JAVA_ARGS -jar /srv/waterfall.jar $WATERFALL_ARGS