Skip to content

Commit

Permalink
vanilla 4.4.6 h2 (SNAPSHOT) container for dev node
Browse files Browse the repository at this point in the history
  • Loading branch information
cmangeat committed Oct 17, 2024
1 parent b3f5000 commit f7c8339
Show file tree
Hide file tree
Showing 7 changed files with 278 additions and 1 deletion.
57 changes: 57 additions & 0 deletions .github/workflows/geocat-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: geocat-docker

on:
push:
branches:
- geocat_4.4.6_vanilla

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
steps:

- name: "Checking out"
uses: actions/checkout@v4
with:
submodules: recursive

- name: "Setup Java JDK"
uses: actions/[email protected]
with:
java-version: 11
distribution: temurin
java-package: jdk
cache: maven

- name: "Cache Maven packages"
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: "Update maven dependencies"
run: mvn -Pdocker de.qaware.maven:go-offline-maven-plugin:resolve-dependencies

- name: "Increase system limits"
run: sudo sysctl -w vm.max_map_count=262144

- name: "Run tests"
run: |
mvn clean verify -Pit
- name: "Installing"
run: mvn -B clean -DskipTests install

- name: "Setting image tag"
id: version
run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)

- name: "Building docker image"
run: mvn -pl web -Pdocker docker:build -DdockerImageName=docker.pkg.github.com/geoadmin/geocat/geocat:${{ steps.version.outputs.VERSION }}-${{ github.run_number }}

- name: "Login to docker.pkg.github.com"
run: docker login -u $GITHUB_ACTOR -p ${{ secrets.GITHUB_TOKEN }} docker.pkg.github.com

- name: "Push to GitHub Packages"
run: docker push docker.pkg.github.com/geoadmin/geocat/geocat:${{ steps.version.outputs.VERSION }}-${{ github.run_number }}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1570,7 +1570,7 @@
<es.installer.extension>tar.gz</es.installer.extension>
<es.protocol>http</es.protocol>
<es.port>9200</es.port>
<es.host>localhost</es.host>
<es.host>es</es.host>
<es.url>${es.protocol}://${es.host}:${es.port}</es.url>
<es.index.features>gn-features</es.index.features>
<es.index.features.type>features</es.index.features.type>
Expand Down
45 changes: 45 additions & 0 deletions web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1392,6 +1392,51 @@
</dependency>
</dependencies>
</profile>

<profile>
<id>docker</id>
<properties>
<dockerImageName>camptocamp/geocat:latest</dockerImageName>
</properties>
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.14</version>
<configuration>
<imageName>${dockerImageName}</imageName>
<dockerDirectory>web/src/docker</dockerDirectory>
<resources>
<resource>
<targetPath>/usr/local/tomcat/webapps</targetPath>
<directory>${project.build.directory}</directory>
<include>geonetwork.war</include>
</resource>
<resource>
<targetPath>/usr/local/bin/</targetPath>
<directory>${project.basedir}/../</directory>
<include>s3sync-geocat-folders.sh</include>
</resource>
<resource>
<targetPath>/</targetPath>
<directory>${project.basedir}/src/docker/</directory>
<include>docker-entrypoint.sh</include>
</resource>
<resource>
<targetPath>/</targetPath>
<directory>${project.basedir}/src/docker/</directory>
<include>docker-entrypoint.d</include>
</resource>
</resources>
<!-- This will require a settings.xml file for maven -->
<serverId>docker-hub</serverId>
<registryUrl>https://index.docker.io/v1/</registryUrl>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<properties>
Expand Down
16 changes: 16 additions & 0 deletions web/src/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM tomcat:8.5.85-jre8

ADD ./server.xml /usr/local/tomcat/conf/

ADD . /

LABEL "io.upkick.warn_only"="true"

# Enable Gzip compression on tomcat
RUN cat /enable_gzip.augtool | augtool --noload --noautoload --echo

RUN cd /usr/local/tomcat/webapps && \
unzip -d geonetwork geonetwork.war && \
rm geonetwork.war

ENTRYPOINT ["/docker-entrypoint.sh", "catalina.sh", "run"]
11 changes: 11 additions & 0 deletions web/src/docker/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash

DIR=/docker-entrypoint.d

if [[ -d "$DIR" ]]
then
/bin/run-parts --verbose "$DIR"
fi

exec "$@"

7 changes: 7 additions & 0 deletions web/src/docker/enable_gzip.augtool
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
set /augeas/load/xml/lens "Xml.lns"
set /augeas/load/xml/incl "/usr/local/tomcat/conf/server.xml"
load
set /files/usr/local/tomcat/conf/server.xml/Server/Service/Connector[#attribute/port = '8080']/#attribute/compression 'on'
set /files/usr/local/tomcat/conf/server.xml/Server/Service/Connector[#attribute/port = '8080']/#attribute/compressibleMimeType 'text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json'
save

141 changes: 141 additions & 0 deletions web/src/docker/server.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<?xml version='1.0' encoding='utf-8'?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Note: A "Server" is not itself a "Container", so you may not
define subcomponents such as "Valves" at this level.
Documentation at /docs/config/server.html
-->
<Server port="8005" shutdown="SHUTDOWN">
<Listener className="org.apache.catalina.startup.VersionLoggerListener" />
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
<Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />

<!-- Global JNDI resources
Documentation at /docs/jndi-resources-howto.html
-->
<GlobalNamingResources>
<!-- Editable user database that can also be used by
UserDatabaseRealm to authenticate users
-->
<Resource name="UserDatabase" auth="Container"
type="org.apache.catalina.UserDatabase"
description="User database that can be updated and saved"
factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
pathname="conf/tomcat-users.xml" />
</GlobalNamingResources>

<!-- A "Service" is a collection of one or more "Connectors" that share
a single "Container" Note: A "Service" is not itself a "Container",
so you may not define subcomponents such as "Valves" at this level.
Documentation at /docs/config/service.html
-->
<Service name="Catalina">

<!--The connectors can use a shared executor, you can define one or more named thread pools-->
<!--
<Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
maxThreads="150" minSpareThreads="4"/>
-->


<!-- A "Connector" represents an endpoint by which requests are received
and responses are returned. Documentation at :
Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
Java AJP Connector: /docs/config/ajp.html
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
-->
<Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" compression="on" compressibleMimeType="text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json" relaxedQueryChars="[]|{}^&#x5c;&#x60;&quot;&lt;&gt;"/>
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
-->
<!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
This connector uses the NIO implementation that requires the JSSE
style configuration. When using the APR/native implementation, the
OpenSSL style configuration is required as described in the APR/native
documentation -->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" />
-->

<!-- Define an AJP 1.3 Connector on port 8009 -->
<!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->

<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
analyzes the HTTP headers included with the request, and passes them
on to the appropriate Host (virtual host).
Documentation at /docs/config/engine.html -->

<!-- You should set jvmRoute to support load-balancing via AJP ie :
<Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-->
<Engine name="Catalina" defaultHost="localhost">

<!--For clustering, please take a look at documentation at:
/docs/cluster-howto.html (simple how to)
/docs/config/cluster.html (reference documentation) -->
<!--
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-->

<!-- Use the LockOutRealm to prevent attempts to guess user passwords
via a brute-force attack -->
<Realm className="org.apache.catalina.realm.LockOutRealm">
<!-- This Realm uses the UserDatabase configured in the global JNDI
resources under the key "UserDatabase". Any edits
that are performed against this UserDatabase are immediately
available for use by the Realm. -->
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase"/>
</Realm>

<Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true">

<!-- SingleSignOn valve, share authentication between web applications
Documentation at: /docs/config/valve.html -->
<!--
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-->

<!-- Access log processes all example.
Documentation at: /docs/config/valve.html
Note: The pattern used is equivalent to using pattern="common" -->
<Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
prefix="localhost_access_log" suffix=".txt"
pattern="%h %l %u %t &quot;%r&quot; %s %b" />

</Host>
</Engine>
</Service>
</Server>

0 comments on commit f7c8339

Please sign in to comment.