Commit 82f3c286 authored by Yann Garcia's avatar Yann Garcia
Browse files

Use Ubuntu 22.04 for dockerization

parent e992e3d4
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
FROM stfubuntu:20.04
FROM stfubuntu:22.04


LABEL ETSI ITS
LABEL ETSI ITS
LABEL description="TS.ITS Docker Image"
LABEL description="TS.ITS Docker Image"
+1 −1
Original line number Original line Diff line number Diff line
FROM ubuntu:20.04
FROM ubuntu:22.04


LABEL ETSI CTI
LABEL ETSI CTI
LABEL description="STF Docker Ubuntu image"
LABEL description="STF Docker Ubuntu image"
+3 −7
Original line number Original line Diff line number Diff line
@@ -35,23 +35,19 @@ ENV TTCN3_DIR=/home/etsi/frameworks/titan/titan.core/Install
ENV PATH=$TTCN3_DIR/bin:$PATH \
ENV PATH=$TTCN3_DIR/bin:$PATH \
    LD_LIBRARY_PATH=$TTCN3_DIR/lib:$LD_LIBRARY_PATH
    LD_LIBRARY_PATH=$TTCN3_DIR/lib:$LD_LIBRARY_PATH


# Set flags
# Set flags & Build Titan
RUN \
RUN \
    echo "ALPINE_LINUX=yes" > Makefile.personal && \
    echo "ALPINE_LINUX=yes" > Makefile.personal && \
    echo "TTCN3_DIR=$TTCN3_DIR" >> Makefile.personal && \
    echo "TTCN3_DIR=$TTCN3_DIR" >> Makefile.personal && \
    echo "JNI=no" >> Makefile.personal && \
    echo "JNI=no" >> Makefile.personal && \
    echo "GUI=no" >> Makefile.personal && \
    echo "GUI=no" >> Makefile.personal && \
    echo "DEBUG=no" >> Makefile.personal || exit 1
    echo "DEBUG=no" >> Makefile.personal || exit 1 && \

# Build Titan
RUN \
    sed --in-place 's/LINUX_LIBS     := -lxml2/LINUX_LIBS     := -lxml2 -lpthread/g' ./core/Makefile && \
    make install && make clean || exit 1
    make install && make clean || exit 1


WORKDIR /home/etsi/dev
WORKDIR /home/etsi/dev


EXPOSE 80/tcp 443/tcp 12340-12349/udp
EXPOSE 80/tcp 443/tcp 12340-12349/udp


ENTRYPOINT ["/home/etsi/dev/TS.ITS/virtualization/docker/docker-entrypoint.sh"]
ENTRYPOINT ["/home/etsi/dev/TS.ITS_r2/virtualization/docker/docker-entrypoint.sh"]


CMD ["help"]
CMD ["help"]