Skip to content

Commit

Permalink
build: add multiple version of the JDK (#54)
Browse files Browse the repository at this point in the history
* build: install multiple JDKs

* fix: build task failed because of configureondemand

* chore: update the config file
  • Loading branch information
zhangt2333 committed Mar 11, 2022
1 parent 9a694e2 commit b618d94
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
12 changes: 9 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,20 @@ ADD https://github.com/SDUOJ/docker-compose-wait/releases/download/2.7.3/wait /w
RUN mkdir -p /sduoj/dockerWorkspace \
&& chmod +x /wait

# install JDKs
ENV JAVA_HOME=/opt/java/openjdk
COPY --from=eclipse-temurin:8 $JAVA_HOME ${JAVA_HOME}8
#COPY --from=eclipse-temurin:17 $JAVA_HOME ${JAVA_HOME}17
# set the default JDK to JDK8
ENV JAVA_HOME=/opt/java/openjdk8
ENV PATH="${JAVA_HOME}/bin:${PATH}"

# install OS softwares
RUN apt-get update \
&& apt-get install -qq -y \
make=4.1-9.1ubuntu1 dosbox=0.74-4.3 cmake \
sudo git unzip wget libseccomp-dev libseccomp2 seccomp build-essential \
python3-pip python vim dos2unix openjdk-8-jdk \
&& ln -sf /usr/lib/jvm/java-8-openjdk-amd64/bin/java /usr/bin/java \
&& ln -sf /usr/lib/jvm/java-8-openjdk-amd64/bin/javac /usr/bin/javac
python3-pip python vim dos2unix

# compile and install sduoj-sandbox
RUN wget -q -O /sduoj/sandbox.zip https://codeload.github.com/SDUOJ/sduoj-sandbox/zip/master \
Expand Down
3 changes: 1 addition & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.parallel=true
org.gradle.configureondemand=true
org.gradle.parallel=true
10 changes: 6 additions & 4 deletions sduoj-judger-service/src/main/resources/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@ sduoj:
application-name: judger-service
active: dev
nacos-addr: nacos.oj.qd.sdu.edu.cn:8848
nacos-config-namespace: ${sduoj.config.active}

spring:
application:
name: ${sduoj.config.application-name}
main:
allow-bean-definition-overriding: true
cloud:
nacos:
config:
namespace: ${sduoj.config.active}
server-addr: ${sduoj.config.nacos-addr}
file-extension: yml
file-extension: yml
discovery:
namespace: ${sduoj.config.active}
server-addr: ${sduoj.config.nacos-addr}
profiles:
active: ${sduoj.config.active}

0 comments on commit b618d94

Please sign in to comment.