#61: A few missing changes

docker/docker-compose.yaml

@@ -7,16 +7,19 @@ services:
       - "8080:8080"
     volumes:
       - ../config:/config/config:ro
+      - ../config/biocache-hub:/data/ala-hub/config/ # Hardcoded paths in the biocache-hub
       - ./tomcat/tomcat-manager-ui/host-manager:/usr/local/tomcat/webapps/host-manager
       - ./tomcat/tomcat-manager-ui/manager:/usr/local/tomcat/webapps/manager
       - vbp-data:/data
     environment:
       LOG_LEVEL: "INFO"
       JAVA_OPTS: "-Xmx6g"
       ADDITIONAL_SPRING_CONFIG_LOCATIONS: "file:/config/config/common/common-docker.yml"
-#      REMOTE_DEBUGGER_PORT: 5005
+      REMOTE_DEBUGGER_PORT: 5005
     extra_hosts:
       - "host.docker.internal:host-gateway"
+      # Use host, so we can easily swap in port-forwarded version of solr
+      - "solr:host-gateway"
     networks:
       default:
         aliases:
@@ -159,7 +162,7 @@ services:
         set -e -x
         ./server/scripts/cloud-scripts/zkcli.sh -zkhost solr:9983 -cmd upconfig -confdir /var/solr/init/docker/solr-data/bie/ -confname bie
         ./server/scripts/cloud-scripts/zkcli.sh -zkhost solr:9983 -cmd upconfig -confdir /var/solr/init/docker/solr-data/biocache/ -confname biocache
-  
+
         curl -X POST --fail 'http://solr:8983/solr/admin/collections?action=CREATE&name=biocache&collection.configName=biocache&numShards=1' || curl -X POST --fail 'http://solr:8983/solr/admin/collections?action=RELOAD&name=biocache'
         curl -X POST --fail 'http://solr:8983/solr/admin/collections?action=CREATE&name=bie&collection.configName=bie&numShards=1' || curl -X POST --fail 'http://solr:8983/solr/admin/collections?action=RELOAD&name=bie'
         curl -X POST --fail 'http://solr:8983/solr/admin/collections?action=CREATE&name=bie-offline&collection.configName=bie&numShards=1' || curl -X POST --fail 'http://solr:8983/solr/admin/collections?action=RELOAD&name=bie-offline'
@@ -206,9 +209,7 @@ services:
       retries: 5
 
   namematching:
-    image: 632683202044.dkr.ecr.eu-west-1.amazonaws.com/namematching-service:2024-11-12
-#    build:
-#      context: namematching
+    image: 632683202044.dkr.ecr.eu-west-1.amazonaws.com/namematching-service:dev
     ports:
       - "9179:9179"
 
@@ -240,6 +241,7 @@ services:
     environment:
       SERVER_PORT: 9999
 
+
 networks:
   default:
 

docker/nginx/conf.d/localhost.conf

@@ -175,7 +175,7 @@ server {
     }
 
     location /mock-oauth2 {
-        proxy_set_header Host localhost;
+        proxy_set_header Host $host;
         proxy_set_header X-Forwarded-Host localhost;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;

docker/pipelines/Dockerfile

@@ -1,7 +1,7 @@
 ARG BUILDPLATFORM=linux/amd64
 FROM --platform=${BUILDPLATFORM} custom-maven AS builder
 
-ARG VERSION=fix-multimedia-record
+ARG VERSION=fixed-stuff
 RUN git clone --branch ${VERSION} --depth 1 https://github.com/StefanVanDyck/pipelines.git /app
 WORKDIR /app
 
@@ -19,7 +19,7 @@ RUN --mount=type=cache,target=/root/.m2/repository \
 # ARG test=2
 # RUN ls -la livingatlas/pipelines/target/pipelines-2.18.6-SNAPSHOT.jar
 #
-# FROM openjdk:8
+FROM openjdk:8
 #
 # ARG VERSION=2.18.6-SNAPSHOT
 RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
@@ -47,16 +47,13 @@ RUN chmod +x /usr/bin/docopts
 
 RUN if [ $TARGETARCH = "amd64" ] ; then curl https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -o "awscliv2.zip" ; fi
 RUN if [ $TARGETARCH = "arm64" ] ; then curl https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip -o "awscliv2.zip" ; fi
-RUN unzip awscliv2.zip && \
+RUN unzip -q awscliv2.zip && \
     ./aws/install
 
-
-COPY config/la-pipelines.yaml /app/livingatlas/configs/la-pipelines.yaml
-
-RUN chown -Rv app:app /app
-
 USER app
 
+COPY --from=builder --chown=app:app /app /app
+
 WORKDIR /app/livingatlas/scripts
 
 ENTRYPOINT ["bash", "-c"]