diff --git a/CHANGES.md b/CHANGES.md index 2aba6414a..9f67910e1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,25 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ -[//]: # (list changes here, using '-' for each new entry, remove this when items are added) +## Changes + +- Delete unused Dockerfiles, fixes + [#349](https://github.com/bird-house/birdhouse-deploy/issues/349) and + [#352](https://github.com/bird-house/birdhouse-deploy/pull/352) + + * birdhouse/docker/geoserver: not used since 3-4 years, replaced by https://github.com/kartoza/docker-geoserver + + * birdhouse/config/geoserver/Dockerfile: was introduced in commit [f3b9896e6b771e0aff62c6851c2376d730ddadaf](https://github.com/bird-house/birdhouse-deploy/commit/f3b9896e6b771e0aff62c6851c2376d730ddadaf) + (PR [#233](https://github.com/bird-house/birdhouse-deploy/pull/233), commit + [d1ecc63284ec9d2940bfa2b1b4baca3fbe1308b3](https://github.com/bird-house/birdhouse-deploy/commit/d1ecc63284ec9d2940bfa2b1b4baca3fbe1308b3)) as a temporary + solution only, not needed with newer kartoza docker images. + +- Move birdhouse/docker/solr to birdhouse/deprecated-components/solr/docker + to group related files together. Solr has been deprecated since PR + [#311](https://github.com/bird-house/birdhouse-deploy/pull/311) + (commit + [a8d3612fdb7fd7758b24e75b0ef697fd3d8ace51](https://github.com/bird-house/birdhouse-deploy/commit/a8d3612fdb7fd7758b24e75b0ef697fd3d8ace51)). + [1.29.2](https://github.com/bird-house/birdhouse-deploy/tree/1.29.2) (2023-08-24) ------------------------------------------------------------------------------------------------------------------ diff --git a/birdhouse/config/geoserver/Dockerfile b/birdhouse/config/geoserver/Dockerfile deleted file mode 100644 index dd4e23751..000000000 --- a/birdhouse/config/geoserver/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -# Temp fix to avoid altering docker image on startup, which makes the image not reproducible. -# docker build -t pavics/geoserver:2.19.0-kartoza-build20210329-r2-with-snakeyaml . - -FROM pavics/geoserver:2.19.0-kartoza-build20210329 - -# Add missing jar for the metadata-plugin. -# Should be fixed by newer version of Geoserver and matching new version of the plugin. -# https://osgeo-org.atlassian.net/browse/GEOS-10078 -RUN wget https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.30/snakeyaml-1.30.jar \ - -O /usr/local/tomcat/webapps/geoserver/WEB-INF/lib/snakeyaml-1.30.jar diff --git a/birdhouse/docker/solr/Dockerfile b/birdhouse/deprecated-components/solr/docker/solr/Dockerfile similarity index 100% rename from birdhouse/docker/solr/Dockerfile rename to birdhouse/deprecated-components/solr/docker/solr/Dockerfile diff --git a/birdhouse/docker/solr/immutable_to_mutable.sh b/birdhouse/deprecated-components/solr/docker/solr/immutable_to_mutable.sh similarity index 100% rename from birdhouse/docker/solr/immutable_to_mutable.sh rename to birdhouse/deprecated-components/solr/docker/solr/immutable_to_mutable.sh diff --git a/birdhouse/docker/solr/mutable_to_immutable.sh b/birdhouse/deprecated-components/solr/docker/solr/mutable_to_immutable.sh similarity index 100% rename from birdhouse/docker/solr/mutable_to_immutable.sh rename to birdhouse/deprecated-components/solr/docker/solr/mutable_to_immutable.sh diff --git a/birdhouse/docker/geoserver/71-apt-cacher-ng b/birdhouse/docker/geoserver/71-apt-cacher-ng deleted file mode 100644 index ddae14edf..000000000 --- a/birdhouse/docker/geoserver/71-apt-cacher-ng +++ /dev/null @@ -1,2 +0,0 @@ -#Acquire::http { Proxy "http://192.168.2.9:3142"; }; -#Acquire::http { Proxy "http://192.168.0.101:3142"; }; diff --git a/birdhouse/docker/geoserver/Dockerfile b/birdhouse/docker/geoserver/Dockerfile deleted file mode 100644 index 87709f39c..000000000 --- a/birdhouse/docker/geoserver/Dockerfile +++ /dev/null @@ -1,144 +0,0 @@ -#--------- Generic stuff all our Dockerfiles should start with so we get caching ------------ -FROM tomcat:8.0-jre8 -MAINTAINER Tim Sutton - -# docker build --build-arg -t kartoza/geoserver . -# docker run --name "postgis" -d -t kartoza/postgis:9.4-2.1 -# docker run --name "geoserver" --link postgis:postgis -p 8080:8080 -d -t kartoza/geoserver -# docker run --link postgis:postgis -p 8081:8080 -v /data/geoserver_data:/opt/geoserver/data_dir -d -t kartoza/geoserver - -RUN export DEBIAN_FRONTEND=noninteractive -ENV DEBIAN_FRONTEND noninteractive -RUN dpkg-divert --local --rename --add /sbin/initctl -#RUN ln -s /bin/true /sbin/initctl - -# Use local cached debs from host (saves your bandwidth!) -# Change ip below to that of your apt-cacher-ng host -# Or comment this line out if you do not with to use caching -ADD 71-apt-cacher-ng /etc/apt/apt.conf.d/71-apt-cacher-ng - -RUN apt-get -y update -RUN apt-get install -y build-essential m4 -RUN apt-get -y update - -#-------------Application Specific Stuff ---------------------------------------------------- - -WORKDIR /tmp -RUN wget ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4/zlib-1.2.8.tar.gz && tar -xvf zlib-1.2.8.tar.gz -RUN cd zlib-1.2.8 && ./configure --prefix=/usr/local && make install -j9 && ldconfig -WORKDIR /tmp -RUN wget ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4/hdf5-1.8.13.tar.gz && tar -xvf hdf5-1.8.13.tar.gz -RUN cd hdf5-1.8.13 && ./configure --prefix=/usr/local -enable-threadsafe && make install -j9 && ldconfig - -WORKDIR /tmp -RUN wget https://github.com/Unidata/netcdf-c/archive/v4.3.3.1.tar.gz && tar -xvf v4.3.3.1.tar.gz -RUN cd netcdf-c-4.3.3.1 && ./configure --prefix=/usr/local && make install -j9 && ldconfig - -ENV GS_VERSION 2.9.3 -ENV GEOSERVER_DATA_DIR /opt/geoserver/data_dir - -RUN mkdir -p $GEOSERVER_DATA_DIR - -# Unset Java related ENVs since they may change with Oracle JDK -ENV JAVA_VERSION= -ENV JAVA_DEBIAN_VERSION= - -# Set JAVA_HOME to /usr/lib/jvm/default-java and link it to OpenJDK installation -RUN ln -s /usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/default-java -ENV JAVA_HOME /usr/lib/jvm/default-java - -ADD resources /tmp/resources - -# If a matching Oracle JDK tar.gz exists in /tmp/resources, move it to /var/cache/oracle-jdk8-installer -# where oracle-java8-installer will detect it -RUN if ls /tmp/resources/*jdk-*-linux-x64.tar.gz > /dev/null 2>&1; then \ - mkdir /var/cache/oracle-jdk8-installer && \ - mv /tmp/resources/*jdk-*-linux-x64.tar.gz /var/cache/oracle-jdk8-installer/; \ - fi; - -# Install Oracle JDK (and uninstall OpenJDK JRE) if the build-arg ORACLE_JDK = true or an Oracle tar.gz -# was found in /tmp/resources -ARG ORACLE_JDK=false -RUN if ls /var/cache/oracle-jdk8-installer/*jdk-*-linux-x64.tar.gz > /dev/null 2>&1 || [ "$ORACLE_JDK" = true ]; then \ - apt-get autoremove --purge -y openjdk-8-jre-headless && \ - echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true \ - | debconf-set-selections && \ - echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main" \ - > /etc/apt/sources.list.d/webupd8team-java.list && \ - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886 && \ - rm -rf /var/lib/apt/lists/* && \ - apt-get update && \ - apt-get install -y oracle-java8-installer oracle-java8-set-default && \ - ln -s --force /usr/lib/jvm/java-8-oracle /usr/lib/jvm/default-java && \ - rm -rf /var/lib/apt/lists/* && \ - rm -rf /var/cache/oracle-jdk8-installer; \ - if [ -f /tmp/resources/jce_policy.zip ]; then \ - unzip -j /tmp/resources/jce_policy.zip -d /tmp/jce_policy && \ - mv /tmp/jce_policy/*.jar $JAVA_HOME/jre/lib/security/; \ - fi; \ - fi; - -#Add JAI and ImageIO for great speedy speed. -WORKDIR /tmp -# A little logic that will fetch the JAI and JAI ImageIO tar file if it -# is not available locally in the resources dir -RUN if [ ! -f /tmp/resources/jai-1_1_3-lib-linux-amd64.tar.gz ]; then \ - wget http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-amd64.tar.gz -P ./resources;\ - fi; \ - if [ ! -f /tmp/resources/jai_imageio-1_1-lib-linux-amd64.tar.gz ]; then \ - wget http://download.java.net/media/jai-imageio/builds/release/1.1/jai_imageio-1_1-lib-linux-amd64.tar.gz -P ./resources;\ - fi; \ - mv resources/jai-1_1_3-lib-linux-amd64.tar.gz ./ && \ - mv resources/jai_imageio-1_1-lib-linux-amd64.tar.gz ./ && \ - gunzip -c jai-1_1_3-lib-linux-amd64.tar.gz | tar xf - && \ - gunzip -c jai_imageio-1_1-lib-linux-amd64.tar.gz | tar xf - && \ - mv /tmp/jai-1_1_3/lib/*.jar $JAVA_HOME/jre/lib/ext/ && \ - mv /tmp/jai-1_1_3/lib/*.so $JAVA_HOME/jre/lib/amd64/ && \ - mv /tmp/jai_imageio-1_1/lib/*.jar $JAVA_HOME/jre/lib/ext/ && \ - mv /tmp/jai_imageio-1_1/lib/*.so $JAVA_HOME/jre/lib/amd64/ && \ - rm /tmp/jai-1_1_3-lib-linux-amd64.tar.gz && \ - rm -r /tmp/jai-1_1_3 && \ - rm /tmp/jai_imageio-1_1-lib-linux-amd64.tar.gz && \ - rm -r /tmp/jai_imageio-1_1 -WORKDIR $CATALINA_HOME - -# A little logic that will fetch the geoserver war zip file if it -# is not available locally in the resources dir -RUN if [ ! -f /tmp/resources/geoserver-${GS_VERSION}-war.zip ]; then \ - wget -c http://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip \ - -O /tmp/resources/geoserver.zip; \ - fi; \ - unzip /tmp/resources/geoserver.zip -d /tmp/geoserver \ - && unzip /tmp/geoserver/geoserver.war -d $CATALINA_HOME/webapps/geoserver \ - && rm -rf $CATALINA_HOME/webapps/geoserver/data \ - && rm -rf /tmp/geoserver - -# Install any plugin zip files in resources/plugins -RUN if ls /tmp/resources/plugins/*.zip > /dev/null 2>&1; then \ - for p in /tmp/resources/plugins/*.zip; do \ - unzip $p -d /tmp/gs_plugin \ - && mv /tmp/gs_plugin/*.jar $CATALINA_HOME/webapps/geoserver/WEB-INF/lib/ \ - && rm -rf /tmp/gs_plugin; \ - done; \ - fi; - -# Overlay files and directories in resources/overlays if they exist -RUN rm -f /tmp/resources/overlays/README.txt && \ - if ls /tmp/resources/overlays/* > /dev/null 2>&1; then \ - cp -rf /tmp/resources/overlays/* /; \ - fi; - -# Optionally remove Tomcat manager, docs, and examples -ARG TOMCAT_EXTRAS=true -RUN if [ "$TOMCAT_EXTRAS" = false ]; then \ - rm -rf $CATALINA_HOME/webapps/ROOT && \ - rm -rf $CATALINA_HOME/webapps/docs && \ - rm -rf $CATALINA_HOME/webapps/examples && \ - rm -rf $CATALINA_HOME/webapps/host-manager && \ - rm -rf $CATALINA_HOME/webapps/manager; \ - fi; - - - -# Delete resources after installation -RUN rm -rf /tmp/resources diff --git a/birdhouse/docker/geoserver/README.rst b/birdhouse/docker/geoserver/README.rst deleted file mode 100644 index 2559dc4f0..000000000 --- a/birdhouse/docker/geoserver/README.rst +++ /dev/null @@ -1,20 +0,0 @@ -docker-geoserver -================ - -A simple docker container that runs Geoserver influenced by this docker -recipe: https://github.com/eliotjordan/docker-geoserver/blob/master/Dockerfile -and modified for the PAVICS Project. - -The actual Geoserver is 2.9.3. -The geoserver data directory rest on the host and must be mapped on /opt/geoserver/data_dir (container) - -Our Dockerfile is a modified version of -https://hub.docker.com/r/kartoza/geoserver/tags, -https://github.com/kartoza/docker-geoserver/blob/a71a2aa79315783283a33436f101857ab7eae5a4/Dockerfile. - -.. code-block:: shell - - docker build --build-arg -t pavics/geoserver . - docker run --name "postgis" -d -t pavics/postgis:9.4-2.1 - docker run --name "geoserver" --link postgis:postgis -p :8080 -v :/opt/geoserver/data_dir -d -t pavics/geoserver - docker run --name "geoserver" --link postgis:postgis -p 8080:8080 -v /data/geoserver_data:/opt/geoserver/data_dir -d -t pavics/geoserver diff --git a/birdhouse/docker/geoserver/build.sh b/birdhouse/docker/geoserver/build.sh deleted file mode 100755 index 8c7cff951..000000000 --- a/birdhouse/docker/geoserver/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -docker build -t kartoza/geoserver . diff --git a/birdhouse/docker/geoserver/resources/README.txt b/birdhouse/docker/geoserver/resources/README.txt deleted file mode 100644 index 2c6756d24..000000000 --- a/birdhouse/docker/geoserver/resources/README.txt +++ /dev/null @@ -1 +0,0 @@ -Resources needed in teh image at build time should be placed here. diff --git a/birdhouse/docker/geoserver/resources/geoserver-2.9.3-war.zip b/birdhouse/docker/geoserver/resources/geoserver-2.9.3-war.zip deleted file mode 100644 index 6e5f8b358..000000000 Binary files a/birdhouse/docker/geoserver/resources/geoserver-2.9.3-war.zip and /dev/null differ diff --git a/birdhouse/docker/geoserver/resources/geoserver.zip b/birdhouse/docker/geoserver/resources/geoserver.zip deleted file mode 100644 index 6e5f8b358..000000000 Binary files a/birdhouse/docker/geoserver/resources/geoserver.zip and /dev/null differ diff --git a/birdhouse/docker/geoserver/resources/jai-1_1_3-lib-linux-amd64.tar.gz b/birdhouse/docker/geoserver/resources/jai-1_1_3-lib-linux-amd64.tar.gz deleted file mode 100644 index 1225c8aa4..000000000 Binary files a/birdhouse/docker/geoserver/resources/jai-1_1_3-lib-linux-amd64.tar.gz and /dev/null differ diff --git a/birdhouse/docker/geoserver/resources/jai_imageio-1_1-lib-linux-amd64.tar.gz b/birdhouse/docker/geoserver/resources/jai_imageio-1_1-lib-linux-amd64.tar.gz deleted file mode 100644 index 63d957081..000000000 Binary files a/birdhouse/docker/geoserver/resources/jai_imageio-1_1-lib-linux-amd64.tar.gz and /dev/null differ diff --git a/birdhouse/docker/geoserver/resources/overlays/README.txt b/birdhouse/docker/geoserver/resources/overlays/README.txt deleted file mode 100644 index 4699e93a9..000000000 --- a/birdhouse/docker/geoserver/resources/overlays/README.txt +++ /dev/null @@ -1,14 +0,0 @@ -To include files in the container file system at arbitrary locations, build -a directory structure from / here and include the files at the desired location. - -For example, to include a static Tomcat setenv.sh in the build, place it at: - -resources/overlays/usr/local/tomcat/bin/setenv.sh - -Other overlay examples include static GeoServer data directories, the Marlin renderer, etc. - -Note that overlay files will overwrite existing destination files, and that -files in the overlay root will be copied to the container root -(e.g. resources/overlay/somefile.txt will be copied to /somefile.txt). - -Be careful! diff --git a/birdhouse/docker/geoserver/resources/plugins/README.txt b/birdhouse/docker/geoserver/resources/plugins/README.txt deleted file mode 100644 index aa8b33cc2..000000000 --- a/birdhouse/docker/geoserver/resources/plugins/README.txt +++ /dev/null @@ -1,2 +0,0 @@ -Download plugin zips and place them here when building to include them in -the container's GeoServer deployment. diff --git a/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-csw-plugin.zip b/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-csw-plugin.zip deleted file mode 100644 index f44563734..000000000 Binary files a/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-csw-plugin.zip and /dev/null differ diff --git a/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-grib-plugin.zip b/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-grib-plugin.zip deleted file mode 100644 index afc02dcc8..000000000 Binary files a/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-grib-plugin.zip and /dev/null differ diff --git a/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-netcdf-out-plugin.zip b/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-netcdf-out-plugin.zip deleted file mode 100644 index 3f2c08acf..000000000 Binary files a/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-netcdf-out-plugin.zip and /dev/null differ diff --git a/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-netcdf-plugin.zip b/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-netcdf-plugin.zip deleted file mode 100644 index e14c7f72e..000000000 Binary files a/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-netcdf-plugin.zip and /dev/null differ diff --git a/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-wps-plugin.zip b/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-wps-plugin.zip deleted file mode 100644 index d35da70e6..000000000 Binary files a/birdhouse/docker/geoserver/resources/plugins/geoserver-2.9.3-wps-plugin.zip and /dev/null differ diff --git a/birdhouse/docker/geoserver/resources/tmp/geoserver-2.9.3-war.zip b/birdhouse/docker/geoserver/resources/tmp/geoserver-2.9.3-war.zip deleted file mode 100644 index 6e5f8b358..000000000 Binary files a/birdhouse/docker/geoserver/resources/tmp/geoserver-2.9.3-war.zip and /dev/null differ diff --git a/birdhouse/docker/geoserver/resources/tmp/jai-1_1_3-lib-linux-amd64.tar.gz b/birdhouse/docker/geoserver/resources/tmp/jai-1_1_3-lib-linux-amd64.tar.gz deleted file mode 100644 index 1225c8aa4..000000000 Binary files a/birdhouse/docker/geoserver/resources/tmp/jai-1_1_3-lib-linux-amd64.tar.gz and /dev/null differ diff --git a/birdhouse/docker/geoserver/resources/tmp/jai_imageio-1_1-lib-linux-amd64.tar.gz b/birdhouse/docker/geoserver/resources/tmp/jai_imageio-1_1-lib-linux-amd64.tar.gz deleted file mode 100644 index 63d957081..000000000 Binary files a/birdhouse/docker/geoserver/resources/tmp/jai_imageio-1_1-lib-linux-amd64.tar.gz and /dev/null differ diff --git a/birdhouse/docker/geoserver/run.sh b/birdhouse/docker/geoserver/run.sh deleted file mode 100755 index 3891e15bd..000000000 --- a/birdhouse/docker/geoserver/run.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -docker kill geoserver -docker rm geoserver -docker kill geoserver-postgis -docker rm geoserver-postgis - -DATA_DIR=~/geoserver_data -if [ ! -d $DATA_DIR ] -then - mkdir -p $DATA_DIR -fi - -docker run --name="geoserver-postgis" -t -d kartoza/postgis - -docker run \ - --name=geoserver \ - --link geoserver-postgis:postgis \ - -v $DATA_DIR:/opt/geoserver/data_dir \ - -p 8080:8080 \ - -d \ - -t kartoza/geoserver