Commit bc80a7f1 authored by Robert Butora's avatar Robert Butora
Browse files

docker: rename Dockerfile.vlkb -> Dockerfile.ingestion entrypoint.sh ->... 

docker: rename Dockerfile.vlkb -> Dockerfile.ingestion  entrypoint.sh -> start-ingestion.sh  start-soda.sh.vlkb -> start-soda.sh and update
parent ab1ee7c7

docker/deplserv.yaml→docker/BACKUP/deplserv.yaml

+0 −0

File moved.

View file

docker/Dockerfile.vlkb→docker/Dockerfile.ingestion

+12 −19
Original line number Diff line number Diff line
@@ -6,21 +6,12 @@ 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 \

            libcfitsio-dev libpqxx-dev libcsv-dev \

 && dpkg -i /tmp/ast_9.2.9-1_amd64.deb \

 && echo "/usr/local/lib" > /etc/ld.so.conf.d/ast.conf \

 && ldconfig \

 && apt -y install rabbitmq-server openjdk-17-jre openjdk-17-jdk tomcat9 tomcat9-admin openssh-server \ 

                   postgresql-client git



 && echo "/usr/local/lib" > /etc/ld.so.conf.d/ast.conf && ldconfig \

 && apt -y install openssh-server postgresql-client



USER root

COPY deps/tomcat-users.xml /etc/tomcat9/

ENV CATALINA_BASE=/var/lib/tomcat9 \

 CATALINA_HOME=/usr/share/tomcat9 \

 CATALINA_TMPDIR=/tmp



RUN useradd -ms /bin/bash devel \

 && usermod -aG sudo devel \

 && echo 'devel:ia2vlkb' | chpasswd
@@ -30,14 +21,17 @@ ENV USER=devel 
WORKDIR /home/devel

ENV HOME=/home/devel



RUN echo "alias vlkb-obscore-dbadd='vlkb-obscore /usr/local/etc/vlkb-obscore/datasets.conf dbadd '" > .bash_aliases

RUN echo "alias vlkb-dbinit='vlkb-obscore /usr/local/etc/vlkb-obscore/datasets.conf dbinit '" >> .bash_aliases

RUN echo "alias vlkb-dbcheck='vlkb-obscore /usr/local/etc/vlkb-obscore/datasets.conf dbcheck '" >> .bash_aliases

RUN echo "alias vlkb-dbadd='vlkb-obscore /usr/local/etc/vlkb-obscore/datasets.conf dbadd '" >> .bash_aliases

RUN echo "alias vlkb-dbremove='vlkb-obscore /usr/local/etc/vlkb-obscore/datasets.conf dbremove '" >> .bash_aliases

RUN echo "alias vlkb-dbmodgroups='vlkb-obscore /usr/local/etc/vlkb-obscore/datasets.conf dbmodgroups '" >> .bash_aliases



# allow sudo without pwd and sudo no checks on hosts

USER root

RUN echo 'devel ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/develallowallcmds \

 && echo 'Defaults !fqdn' > /etc/sudoers.d/nodns





RUN mkdir /var/run/sshd \

 && echo 'root:deb11develenv' | chpasswd \

 && sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config \
@@ -46,14 +40,13 @@ RUN mkdir /var/run/sshd \ 
EXPOSE 22



# vlkb-obscore*.deb installs to /usr/local

ENV INST_DIR=/usr/local

ARG VLKB_VERSION

COPY vlkb-obscore-${VLKB_VERSION}.deb ./

RUN dpkg -i vlkb-obscore-${VLKB_VERSION}.deb

ENV INST_DIR=/usr/local



COPY entrypoint.sh /root

RUN chmod +x /root/entrypoint.sh

CMD ["/root/entrypoint.sh"]

#CMD ["sh", "-c", "/root/entrypoint.sh"]

COPY start-ingestion.sh /root

RUN chmod +x /root/start-ingestion.sh

CMD ["/root/start-ingestion.sh"]

docker/Dockerfile.soda

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ RUN chmod a+rw ${WEBAPP_DIR}/WEB-INF/web.xml \ 
 && chmod a+rw ${WEBAPP_DIR}/WEB-INF/classes/*.properties



# configure during start-up

COPY start-soda.sh.soda /root/start-soda.sh

COPY start-soda.sh /root/start-soda.sh



RUN chmod +rx /root && chmod +rx /root/start-soda.sh

USER 1000:1000

docker/Makefile

+31 −29
Original line number Diff line number Diff line 


VERSION ?= $(shell git describe)





all:



deps/ast-9.2.9.tar.gz:

	wget https://github.com/Starlink/ast/files/8843897/ast-9.2.9.tar.gz --directory-prefix deps



download-all: vlkb-soda vlkbd vlkb-obscore vlkb



vlkb-soda:

	make download PACK_FILE=$@-$(VERSION).war



vlkbd vlkb-obscore vlkb:

	make download PACK_FILE=$@-$(VERSION).rpm

	make download PACK_FILE=$@-$(VERSION).deb





.PHONY: download

download: GITLAB_PROJ_ID := 79

download: GITLAB_PROJ_NAME := $(shell basename -s .git `git config --get remote.origin.url`)

download: VER_MAJOR := $(shell echo $(VERSION) | cut -f1 -d.)

download: VER_MINOR := $(shell echo $(VERSION) | cut -f2 -d.)

download: PACK_URL := "https://ict.inaf.it/gitlab/api/v4/projects/$(GITLAB_PROJ_ID)/packages/generic/$(GITLAB_PROJ_NAME)/$(VER_MAJOR).$(VER_MINOR)/$(PACK_FILE)"

download:

	curl -O --header "PRIVATE-TOKEN: glpat-CJZDcks7bYqE__ePn4J6" $(PACK_URL)



# Token updated Nov 2024:          glpat-g6SwwtHWssNQG5zRWBAk



ast-9.2.9.tar.gz:

	wget https://github.com/Starlink/ast/files/8843897/ast-9.2.9.tar.gz







.PHONY: build

.PHONY: build-soda

build-soda:

	docker build --build-arg VLKB_VERSION=$(VERSION) -t soda -f Dockerfile.soda .



.PHONY: build-ingestion

build-ingestion:

	docker build --build-arg VLKB_VERSION=$(VERSION) -t ingestion -f Dockerfile.vlkb .

	docker build --build-arg VLKB_VERSION=$(VERSION) -t ingestion -f Dockerfile.ingestion .





# the docker-login below needed a ca-cert(?) which in the middle of the certificate-chain,
@@ -47,6 +23,12 @@ build-ingestion: 
# to download: use image: ... in compose.yaml or

# docker run ... git.ia2.inaf.it:5050/vialactea/vlkb-soda



publish-locally-soda:

	docker tag ingestion git.ia2.inaf.it:5050/vialactea/vlkb-soda/soda:$(VERSION)

	docker push     git.ia2.inaf.it:5050/vialactea/vlkb-soda/soda:$(VERSION)

	docker image rm git.ia2.inaf.it:5050/vialactea/vlkb-soda/soda:$(VERSION)





publish-locally-ingestion:

	docker tag ingestion git.ia2.inaf.it:5050/vialactea/vlkb-soda/ingestion:$(VERSION)

	docker push     git.ia2.inaf.it:5050/vialactea/vlkb-soda/ingestion:$(VERSION)
@@ -91,4 +73,24 @@ publish-remotely-to-ska-harbor: 
#	@echo "REMOTE_SODA_IMAGE_NAME : "$(REMOTE_SODA_IMAGE_NAME)

###############################################################################



download-all: vlkb-soda vlkbd vlkb-obscore vlkb



vlkb-soda:

	make download PACK_FILE=$@-$(VERSION).war



vlkbd vlkb-obscore vlkb:

	make download PACK_FILE=$@-$(VERSION).rpm

	make download PACK_FILE=$@-$(VERSION).deb



.PHONY: download

download: GITLAB_PROJ_ID := 79

download: GITLAB_PROJ_NAME := $(shell basename -s .git `git config --get remote.origin.url`)

download: VER_MAJOR := $(shell echo $(VERSION) | cut -f1 -d.)

download: VER_MINOR := $(shell echo $(VERSION) | cut -f2 -d.)

download: PACK_URL := "https://ict.inaf.it/gitlab/api/v4/projects/$(GITLAB_PROJ_ID)/packages/generic/$(GITLAB_PROJ_NAME)/$(VER_MAJOR).$(VER_MINOR)/$(PACK_FILE)"

download:

	curl -O --header "PRIVATE-TOKEN: glpat-CJZDcks7bYqE__ePn4J6" $(PACK_URL)



# Token updated Nov 2024:          glpat-g6SwwtHWssNQG5zRWBAk