diff --git a/docker/Dockerfile.ingestion b/docker/Dockerfile.ingestion deleted file mode 100644 index a3a87b4cddbf039fb259938f0d47f52fbf10ca3f..0000000000000000000000000000000000000000 --- a/docker/Dockerfile.ingestion +++ /dev/null @@ -1,52 +0,0 @@ -FROM tomcat:9-jre17-temurin-jammy -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 libcsv-dev libdavix0v5 \ - && 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 openssh-server postgresql-client - -USER root -RUN useradd -ms /bin/bash devel \ - && usermod -aG sudo devel \ - && echo 'devel:ia2vlkb' | chpasswd - -USER devel -ENV USER=devel -WORKDIR /home/devel -ENV HOME=/home/devel - -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 \ - && sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd - -EXPOSE 22 - -# vlkb-obscore*.deb installs to /usr/local -ENV INST_DIR=/usr/local -ARG VLKB_VERSION -COPY vlkb-obscore-${VLKB_VERSION}.deb vlkb-${VLKB_VERSION}.deb ./ -RUN dpkg -i vlkb-obscore-${VLKB_VERSION}.deb vlkb-${VLKB_VERSION}.deb - -COPY start-ingestion.sh /root -RUN chmod +x /root/start-ingestion.sh -CMD ["/root/start-ingestion.sh"] - - diff --git a/docker/Makefile b/docker/Makefile index 3983bedf5d3c7c5cf8a32a45539ba833a0387182..6dc0f719c34f0abcd0ae918fef1f441139bb4153 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -10,11 +10,6 @@ deps/ast-9.2.9.tar.gz: build-soda: docker build --progress=plain --no-cache --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.ingestion . - - # the docker-login below needed a ca-cert(?) which in the middle of the certificate-chain, # but was not automatically downloaded and also local cert/ket pair(?) -> # -> see: /etc/docker/certs.d/git.ia2.ianf.it:5050/* @@ -29,12 +24,6 @@ publish-locally-soda: 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) - docker image rm git.ia2.inaf.it:5050/vialactea/vlkb-soda/ingestion:$(VERSION) - - ##docker login registry.gitlab.com --> robert.butora xC*n publish-remotely-to-ska: docker tag soda registry.gitlab.com/ska-telescope/src/visivo-vlkb-soda:$(VERSION) diff --git a/docker/example-compose-ingestion.yaml b/docker/example-compose-ingestion.yaml deleted file mode 100644 index 188b705677c090397e00053efbeb4114c8694436..0000000000000000000000000000000000000000 --- a/docker/example-compose-ingestion.yaml +++ /dev/null @@ -1,41 +0,0 @@ - -services: - - # from hot running the docker: psql -U postgres -l localhost - vlkb-db: - container_name: vlkb-db - image: git.ia2.inaf.it:5050/vialactea/vlkb-db/postgres-pgsphere:latest - #image: git.ia2.inaf.it:5050/butora/vlkb-datasets/postgres-pgsphere:latest - #image: registry.gitlab.com/ska-telescope/src/visivo-vlkb-soda:1.5.2 - hostname: vlkb-db - ports: - - 5432:5432 - #image: postgres-pgsphere:latest - #network_mode: "host" - environment: - - SECURITY= - - POSTGRES_PASSWORD=ia2vlkb - volumes: - - postgres-data:/var/lib/postgresql/data - - - vlkb: - container_name: vlkb - image: ingestion:latest - #image: git.ia2.inaf.it:5050/vialactea/vlkb-soda/ingestion:1.7.10-7-g70b03e9 - hostname: vlkb - #ports: - # - 2222:22 - environment: - #-OBSCORE_DB_URI=postgresql://vialactea:ia2vlkb@pasquale.ia2.inaf.it:5432/vialacteadevel - - OBSCORE_DB_URI=postgresql://vialactea:ia2vlkb@vlkb-db:5432/vialactea - - OBSCORE_DB_SCHEMA=datasets - - OBSCORE_ACCESS_URL="somedummytext" - volumes: - #- /media/robi/WORK/w/git/vlkb-soda/docker/start-vlkb.log:/tmp/start-vlkb.log:rw - - /srv/vlkb/surveys:/srv/datasets:ro - #restart: always - -volumes: - postgres-data: - diff --git a/docker/start-ingestion.sh b/docker/start-ingestion.sh deleted file mode 100755 index bc016b5183824812c845a54ed1824baddff03097..0000000000000000000000000000000000000000 --- a/docker/start-ingestion.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - - -{ -# echo "fits_path_datasets=/srv/datasets -echo "pg_uri=$OBSCORE_DB_URI" -echo "pg_schema=$OBSCORE_DB_SCHEMA" -echo "obscore_access_url=$OBSCORE_ACCESS_URL" -echo "obscore_publisher=$OBSCORE_PUBLISHER" -# echo obscore_access_format=application/fits -# echo log_dir=/tmp -# echo log_filename=vlkb-obscore.log -} > $INST_DIR/etc/vlkb-obscore/datasets.conf - - -exec /usr/sbin/sshd -D