Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated GN version to 3.6.0 #5347

Merged
merged 1 commit into from
Jan 29, 2019
Merged

Conversation

doublebyte1
Copy link
Contributor

Updated official GN version to its latest release (3.6.0), to catch up with the latest changes on the image code.

@yosifkit
Copy link
Member

We've found lines that just change mode to be very problematic in the past, can we swap back to having the chmod stored in git?

+RUN chmod +x /entrypoint.sh

@doublebyte1
Copy link
Contributor Author

We've found lines that just change mode to be very problematic in the past, can we swap back to having the chmod stored in git?

+RUN chmod +x /entrypoint.sh

@yosifkit sure, just did here and here

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 44b633c..f4d6270 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,6 @@
-geonetwork:3.4
-geonetwork:3.4-postgres
-geonetwork:3.4.4
-geonetwork:3.4.4-postgres
+geonetwork:3.6
+geonetwork:3.6-postgres
+geonetwork:3.6.0
+geonetwork:3.6.0-postgres
 geonetwork:latest
 geonetwork:postgres
diff --git a/geonetwork_latest/Dockerfile b/geonetwork_latest/Dockerfile
index 1152c65..85fcf09 100644
--- a/geonetwork_latest/Dockerfile
+++ b/geonetwork_latest/Dockerfile
@@ -5,8 +5,8 @@ ENV DATA_DIR=$CATALINA_HOME/webapps/geonetwork/WEB-INF/data
 ENV JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom -Djava.awt.headless=true -server -Xms512m -Xmx2024m -XX:NewSize=512m -XX:MaxNewSize=1024m -XX:+UseConcMarkSweepGC"
 
 #Environment variables
-ENV GN_VERSION 3.4.4
-ENV GN_DOWNLOAD_MD5 279ea63b0f75499d02316b320cf3db3e
+ENV GN_VERSION 3.6.0
+ENV GN_DOWNLOAD_MD5 06601ea4b16e4f8e806c7369ea0060ae
 
 WORKDIR $CATALINA_HOME/webapps
 
diff --git a/geonetwork_postgres/Dockerfile b/geonetwork_postgres/Dockerfile
index aad2914..9996356 100644
--- a/geonetwork_postgres/Dockerfile
+++ b/geonetwork_postgres/Dockerfile
@@ -1,4 +1,4 @@
-FROM geonetwork:3.4.4
+FROM geonetwork:3.6.0
 
 RUN apt-get update && apt-get install -y postgresql-client && \
     rm -rf /var/lib/apt/lists/*

Build test of #5347; c86eccd; amd64 (geonetwork):

$ bashbrew build geonetwork:3.6.0
Building bashbrew/cache:8170fca58aa92d0ee8a4837c758e0b9962449c867baebb2f14f2b8123c71cb15 (geonetwork:3.6.0)
Tagging geonetwork:3.6.0
Tagging geonetwork:3.6
Tagging geonetwork:latest

$ test/run.sh geonetwork:3.6.0
testing geonetwork:3.6.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build geonetwork:3.6.0-postgres
Building bashbrew/cache:89621b7b5a5f2e1ab07c096bbe22aebd4b96f8d00e128afb7fa95ad9dc27a71d (geonetwork:3.6.0-postgres)
Tagging geonetwork:3.6.0-postgres
Tagging geonetwork:3.6-postgres
Tagging geonetwork:postgres

$ test/run.sh geonetwork:3.6.0-postgres
testing geonetwork:3.6.0-postgres
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@yosifkit yosifkit merged commit 8d39392 into docker-library:master Jan 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants