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

Fix some tags #7376

Merged
merged 1 commit into from Jan 30, 2020
Merged

Fix some tags #7376

merged 1 commit into from Jan 30, 2020

Conversation

vmassol
Copy link
Contributor

@vmassol vmassol commented Jan 30, 2020

@tianon
Copy link
Member

tianon commented Jan 30, 2020

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 8be61ea..4bf64cd 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,6 +1,6 @@
 xwiki:latest @ amd64
-xwiki:mysql-tomcat @ amd64
-xwiki:postgres-tomcat @ amd64
-xwiki:postgres-tomcat @ arm64v8
+xwiki:lts @ amd64
+xwiki:lts-postgres @ amd64
+xwiki:lts-postgres @ arm64v8
 xwiki:stable-postgres @ amd64
 xwiki:stable-postgres @ arm64v8
diff --git a/xwiki_postgres-tomcat/Dockerfile b/xwiki_lts-postgres/Dockerfile
similarity index 100%
rename from xwiki_postgres-tomcat/Dockerfile
rename to xwiki_lts-postgres/Dockerfile
diff --git a/xwiki_mysql-tomcat/tomcat/setenv.sh b/xwiki_lts-postgres/tomcat/setenv.sh
similarity index 100%
rename from xwiki_mysql-tomcat/tomcat/setenv.sh
rename to xwiki_lts-postgres/tomcat/setenv.sh
diff --git a/xwiki_mysql-tomcat/xwiki/docker-entrypoint.sh b/xwiki_lts-postgres/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_mysql-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_lts-postgres/xwiki/docker-entrypoint.sh
diff --git a/xwiki_postgres-tomcat/xwiki/hibernate.cfg.xml b/xwiki_lts-postgres/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_postgres-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_lts-postgres/xwiki/hibernate.cfg.xml
diff --git a/xwiki_mysql-tomcat/Dockerfile b/xwiki_lts/Dockerfile
similarity index 100%
rename from xwiki_mysql-tomcat/Dockerfile
rename to xwiki_lts/Dockerfile
diff --git a/xwiki_postgres-tomcat/tomcat/setenv.sh b/xwiki_lts/tomcat/setenv.sh
similarity index 100%
rename from xwiki_postgres-tomcat/tomcat/setenv.sh
rename to xwiki_lts/tomcat/setenv.sh
diff --git a/xwiki_postgres-tomcat/xwiki/docker-entrypoint.sh b/xwiki_lts/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_postgres-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_lts/xwiki/docker-entrypoint.sh
diff --git a/xwiki_mysql-tomcat/xwiki/hibernate.cfg.xml b/xwiki_lts/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_mysql-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_lts/xwiki/hibernate.cfg.xml

@tianon
Copy link
Member

tianon commented Jan 30, 2020

Tag changes only, merging (hopefully this doesn't hit https://github.com/docker-library/official-images/issues/5216 😅).

@tianon tianon merged commit b6b51fc into docker-library:master Jan 30, 2020
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.

None yet

3 participants