Skip to content

Commit

Permalink
Removed legacy code
Browse files Browse the repository at this point in the history
  • Loading branch information
giohappy committed Aug 21, 2023
1 parent f6185a8 commit c0c4754
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 107 deletions.
11 changes: 1 addition & 10 deletions docker/geoserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ RUN wget --no-check-certificate https://repo1.maven.org/maven2/org/postgis/postg
RUN mkdir -p /usr/local/tomcat/tmp
WORKDIR /usr/local/tomcat/tmp
COPY set_geoserver_auth.sh /usr/local/tomcat/tmp
COPY setup_auth.sh /usr/local/tomcat/tmp
COPY requirements.txt /usr/local/tomcat/tmp
COPY get_dockerhost_ip.py /usr/local/tomcat/tmp
COPY get_nginxhost_ip.py /usr/local/tomcat/tmp
COPY entrypoint.sh /usr/local/tomcat/tmp
COPY ./templates /templates
COPY multidump.sh /usr/local/tomcat/tmp
Expand All @@ -56,12 +52,7 @@ RUN apt-get update \
&& apt-get install -y procps less \
&& apt-get install -y python3 python3-pip python3-dev \
&& chmod +x /usr/local/tomcat/tmp/set_geoserver_auth.sh \
&& chmod +x /usr/local/tomcat/tmp/setup_auth.sh \
&& chmod +x /usr/local/tomcat/tmp/entrypoint.sh \
&& pip3 install pip --upgrade \
&& pip3 install -r requirements.txt \
&& chmod +x /usr/local/tomcat/tmp/get_dockerhost_ip.py \
&& chmod +x /usr/local/tomcat/tmp/get_nginxhost_ip.py
&& chmod +x /usr/local/tomcat/tmp/entrypoint.sh

RUN pip install j2cli

Expand Down
3 changes: 0 additions & 3 deletions docker/geoserver/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ fi
if [ -z `echo ${NGINX_BASE_URL} | sed 's/http:\/\/\([^:]*\).*/\1/'` ]
then
echo "NGINX_BASE_URL is empty so I'll use the static nginx hostname \n"
# echo export NGINX_BASE_URL=`python3 /usr/local/tomcat/tmp/get_nginxhost_ip.py` >> /root/.override_env
# TODO rework get_nginxhost_ip to get URL with static hostname from nginx service name
# + exposed port of that container i.e. http://django:8000
echo export NGINX_BASE_URL=http://django:8000 >> /root/.override_env
echo "The calculated value is now NGINX_BASE_URL='$NGINX_BASE_URL' \n"
else
Expand Down
31 changes: 0 additions & 31 deletions docker/geoserver/get_dockerhost_ip.py

This file was deleted.

59 changes: 0 additions & 59 deletions docker/geoserver/get_nginxhost_ip.py

This file was deleted.

1 change: 0 additions & 1 deletion docker/geoserver/requirements.txt

This file was deleted.

3 changes: 0 additions & 3 deletions docker/geoserver/setup_auth.sh

This file was deleted.

0 comments on commit c0c4754

Please sign in to comment.