Commit 6a7626ff authored by Robert Butora's avatar Robert Butora
Browse files

docker: renames Dockerfile.vlkb -> Dokerfile & config-vlkb -> config

parent 1806cb8a

docker/Dockerfile.vlkb→docker/Dockerfile

+4 −4
Original line number Diff line number Diff line
@@ -44,12 +44,12 @@ RUN mkdir -p ${INST_DIR}/etc/vlkb-obscore \ 


# configure during docker build-time



COPY config-vlkb/vlkb-obscore.datasets.conf ${INST_DIR}/etc/vlkb-obscore/datasets.conf

COPY config-vlkb/vlkbd.datasets.conf ${INST_DIR}/etc/vlkbd/datasets.conf

COPY config/vlkb-obscore.datasets.conf ${INST_DIR}/etc/vlkb-obscore/datasets.conf

COPY config/vlkbd.datasets.conf ${INST_DIR}/etc/vlkbd/datasets.conf



# created in entrypoint.sh COPY config-vlkb/servlet.cutout.properties /webapps/vlkb-cutout/WEB-INF/classes/cutout.properties

# created in entrypoint.sh COPY config/servlet.cutout.properties /webapps/vlkb-cutout/WEB-INF/classes/cutout.properties



COPY config-vlkb/auth.properties config-vlkb/neatoken.properties config-vlkb/iamtoken.properties /webapps/vlkb-cutout/WEB-INF/classes/

COPY config/auth.properties config/neatoken.properties config/iamtoken.properties /webapps/vlkb-cutout/WEB-INF/classes/



#COPY ssl/keystore.jks /root/

COPY ssl/server.xml ssl/server-connector-8080.xml ssl/server-connector-8443.xml /etc/tomcat9/

docker/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ ast-9.2.9.tar.gz: 


.PHONY: build

build:

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

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



# 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(?) ->