diff --git a/docker/Dockerfile.vlkb b/docker/Dockerfile.vlkb index 7ffbf3fb0c1c26fe7f6e856b49170f9baa06dbe0..10a97da10cd8f5ca3997bbb4d2db6822976d79e7 100644 --- a/docker/Dockerfile.vlkb +++ b/docker/Dockerfile.vlkb @@ -1,16 +1,13 @@ -# bullseye-slim = debian11 -#FROM debian:bullseye-slim -#LABEL Description="debian11 devel-env" -# Jammy Jellyfish = ubuntu22 FROM tomcat:9-jre17-temurin-jammy -LABEL Description="ubuntu22 devel-env" - +LABEL Description="VLKB Ingestion / Ubuntu 22 (Jammy Jellyfish)" COPY deps/ast_9.2.9-1_amd64.deb /tmp/ RUN apt -y update \ - && apt -y install sudo procps psmisc curl wget vim make build-essential checkinstall tree htop unzip \ - libcfitsio-dev libpqxx-dev librabbitmq-dev libcsv-dev libdavix0v5 davix-dev gfortran \ + && apt -y install sudo procps psmisc \ + curl wget vim make build-essential checkinstall tree htop unzip \ + libcfitsio-dev libpqxx-dev librabbitmq-dev libcsv-dev libdavix0v5 davix-dev \ + gfortran \ && dpkg -i /tmp/ast_9.2.9-1_amd64.deb \ && echo "/usr/local/lib" > /etc/ld.so.conf.d/ast.conf \ && ldconfig \ @@ -25,7 +22,8 @@ ENV CATALINA_BASE=/var/lib/tomcat9 \ CATALINA_TMPDIR=/tmp RUN useradd -ms /bin/bash devel \ - && usermod -aG sudo devel + && usermod -aG sudo devel \ + && echo 'devel:ia2vlkb' | chpasswd USER devel ENV USER=devel @@ -55,6 +53,7 @@ ENV INST_DIR=/usr/local COPY entrypoint.sh /root RUN chmod +x /root/entrypoint.sh -CMD ["sh", "-c", "/root/entrypoint.sh"] +CMD ["/root/entrypoint.sh"] +#CMD ["sh", "-c", "/root/entrypoint.sh"]