11.08., 9:00 - 11:00: Due to updates GitLab will be unavailable for some minutes between 09:00 and 11:00.

Commit bff176c7 authored by Salomon Sickert-Zehnter's avatar Salomon Sickert-Zehnter

Merge branch 'dockerfile' into 'master'

Publish Dockerfile and Update Build Environment

See merge request i7/owl!358
parents 06c86e06 3b14fba4
image: gitlab.lrz.de:5005/i7/owl:jdk14
image: gitlab.lrz.de:5005/i7/owl:ba23e343
before_script:
- chmod +x gradlew
......
......@@ -26,6 +26,7 @@ a | G (b | (a & F b))
a U (X (b & X (F a)))
G (a | (F (a & X b)))
!((a <-> b) -> (F b))
F G ((X a) | (a W X a))
(a U b) | (G (c | X a))
(a W (b <-> X G a)) W a
F (a | ((X (! a)) R b))
......@@ -37,11 +38,13 @@ F ((a U b) & (G a | F c))
(a U (G a)) | (b U (G b))
F G a | F (b & G (b | c))
G a | G (F b & F (a | c))
F ((G F a) | G (a | X a))
(G a) | ((F b) W (b & X b))
G (G a | (F b & G (b | c)))
F (a & ((!a & !c) | G F c))
G (a U (b | G (!c | X F d)))
F (G !a | G a | (!a & X G b))
G F ((a & XXa) | (!a & XX!a))
((F G a) & F b) | G b | G F a
a & GF ((a | b) & (Ga | !GFa))
(F a) & ((a R (a | b)) R (!a))
......
FROM ubuntu:focal
MAINTAINER Salomon Sickert
# Remember: Most commands are chained in order to reduce the number of created
# layers and hence the size of the final image.
# Default to UTF-8 file encoding
ENV LANG C.UTF-8
# Install base system
RUN apt-get -q update \
&& apt-get -q upgrade -y \
&& apt-get -q install -y --no-install-recommends ca-certificates pandoc python3 python3-tabulate graphviz time gcc g++ make netcat unzip wget \
&& rm -rf /var/lib/apt/lists/*
# GraalVM
## Download, verify, unpack, and install
RUN wget -q https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz \
&& echo '18f2dc19652c66ccd5bd54198e282db645ea894d67357bf5e4121a9392fc9394 graalvm-ce-java11-linux-amd64-20.1.0.tar.gz' | sha256sum --check \
&& tar -zxvf graalvm-ce-java11-linux-amd64-20.1.0.tar.gz \
&& rm graalvm-ce-java11-linux-amd64-20.1.0.tar.gz \
&& mv graalvm-ce-java11-20.1.0 /opt/
ENV PATH=/opt/graalvm-ce-java11-20.1.0/bin/:$PATH
ENV JAVA_HOME=/opt/graalvm-ce-java11-20.1.0/
RUN gu install native-image
# Spot
## Download, verify, unpack, compile, and install
RUN wget -q https://www.lrde.epita.fr/dload/spot/spot-2.8.7.tar.gz \
&& echo 'bdbeb4454f0244b6b77e1b04458558ab62471aaa21918e104602e6da99969c1f spot-2.8.7.tar.gz' | sha256sum --check \
&& tar -zxvf spot-2.8.7.tar.gz \
&& rm spot-2.8.7.tar.gz \
&& cd spot-2.8.7 \
&& ./configure --disable-python --enable-max-accsets=1024 \
&& make -j 4 \
&& make install \
&& cd .. \
&& rm -rf spot-2.8.7
ENV LD_LIBRARY_PATH=/usr/local/lib/
# Print Configuration
RUN java -version \
&& native-image --version \
&& ltlcross --version
......@@ -27,7 +27,7 @@ def _test(args, check):
test_names = args[0].split(";")
test_set_override = None
if len(args) is 2:
if len(args) == 2:
test_set_override = args[1]
test_config = owl_defaults.load_json(database)
......@@ -284,7 +284,7 @@ def _benchmark(args):
if __name__ == "__main__":
if len(sys.argv) is 1:
if len(sys.argv) == 1:
print("Usage: util.py <type> <args>")
sys.exit(1)
......
......@@ -51,7 +51,7 @@ public final class InputReaders {
"ltl",
"Parses LTL formulas and converts them into NNF",
(commandLine, environment) -> (reader, callback, stopSignal) ->
CharStreams.readLines(reader, new LineProcessor<>() {
CharStreams.readLines(reader, new LineProcessor<Void>() {
@Override
public boolean processLine(String line) {
if (stopSignal.get()) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment