Compare commits

..

24 Commits
b83 ... master

Author SHA1 Message Date
Icedream e582b3bde4
Update Readme. 2017-03-27 09:48:42 +02:00
Icedream 8be06c90e4
Update to Waterfall build 103. 2017-03-27 09:45:49 +02:00
Icedream ba7afaba0e
Update to Waterfall build 102. 2017-03-27 09:45:20 +02:00
Icedream cfd3a7a59f
Build Waterfall in Docker instead of downloading from CI build server. 2017-02-14 14:23:17 +01:00
Icedream 822401becb
Use COPY instead of ADD. 2017-02-14 14:22:07 +01:00
Icedream d951828a62
Use openjdk:8-jre-alpine as base image. 2017-02-14 14:21:42 +01:00
Icedream 569d2e4046
Update to Waterfall build 101. 2017-02-13 14:00:21 +01:00
Icedream f1e5a7bc19
Update to Waterfall build 100. 2017-02-02 12:25:46 +01:00
Icedream c98cfa07fb
Update to Waterfall build 99. 2017-02-02 12:25:44 +01:00
Icedream 7b05709b3a
Update to Waterfall build 98. 2017-02-02 12:25:42 +01:00
Icedream 4bd74f3e77
Update to Waterfall build 97. 2017-02-02 12:25:39 +01:00
Icedream e01d86d97e
Update to Waterfall build 96. 2017-02-02 12:25:37 +01:00
Icedream 57d693d373
Update to Waterfall build 95. 2017-02-02 12:25:35 +01:00
Icedream 6ed634456e
Update to Waterfall build 94. 2017-02-02 12:25:33 +01:00
Icedream 23883882df
Update to Waterfall build 93. 2017-02-02 12:25:31 +01:00
Icedream 18c8552f9d
Update to Waterfall build 92. 2017-02-02 12:25:29 +01:00
Icedream cda823f14a
Update to Waterfall build 91. 2017-02-02 12:25:27 +01:00
Icedream 25c5f52be6
Update to Waterfall build 90. 2017-02-02 12:25:25 +01:00
Icedream 22785bf311
Update to Waterfall build 89. 2017-02-02 12:25:22 +01:00
Icedream 6feb9071a8
Update to Waterfall build 88. 2017-02-02 12:25:20 +01:00
Icedream 5ec80485f8
Update to Waterfall build 87. 2017-02-02 12:25:17 +01:00
Icedream a07d58736c
Update to Waterfall build 86. 2017-02-02 12:25:15 +01:00
Icedream 86b73b5b33
Update to Waterfall build 85. 2017-02-02 12:25:13 +01:00
Icedream 27d73e73cc
Update to Waterfall build 84. 2017-02-02 12:25:11 +01:00
3 changed files with 45 additions and 11 deletions

View File

@ -1,15 +1,49 @@
FROM java:8-alpine FROM openjdk:8-jre-alpine
ARG WATERFALL_BUILD=83 ARG WATERFALL_GIT_URL=https://github.com/WaterfallMC/Waterfall.git
ARG WATERFALL_URL=https://ci.destroystokyo.com/job/Waterfall/${WATERFALL_BUILD}/artifact/Waterfall-Proxy/bootstrap/target/Waterfall.jar ARG WATERFALL_VERSION=8ff8de0fbdbf14d0b3e842780738f6d0b204d07a
ARG WATERFALL_SHA512=b7486a6020bc3a7d89b024512642c23359e21f2ea39f2f899ebf832792fa5bbe78c752ee010c07d3aacf4f0a64c811d6a6cd769d689efdc2cbbb2851febe27ed
WORKDIR /data ARG MAVEN_VERSION=3.3.9
ADD "${WATERFALL_URL}" /srv/waterfall.jar
RUN cd /srv &&\
chmod 444 /srv/waterfall.jar
ADD start.sh /usr/local/bin/waterfall ARG WATERFALL_WORKSPACE=/usr/src/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`, `b83`: Latest version of Waterfall. - `latest`, `b103`: 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