diff --git a/linux/atlassian/confluence/6/6.0.1/.env b/linux/atlassian/confluence/6/6.0.1/.env new file mode 100644 index 000000000..ecd7bb585 --- /dev/null +++ b/linux/atlassian/confluence/6/6.0.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.0.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.0.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.0.1/Dockerfile b/linux/atlassian/confluence/6/6.0.1/Dockerfile index 60a125dfc..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.0.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.0.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.0.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.0.1/Makefile b/linux/atlassian/confluence/6/6.0.1/Makefile index 54e5248ee..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.0.1/Makefile +++ b/linux/atlassian/confluence/6/6.0.1/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.0.1 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.0.1/docker-compose.yml b/linux/atlassian/confluence/6/6.0.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.0.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.0.2/.env b/linux/atlassian/confluence/6/6.0.2/.env new file mode 100644 index 000000000..19ab3b392 --- /dev/null +++ b/linux/atlassian/confluence/6/6.0.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.0.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.0.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.0.2/Dockerfile b/linux/atlassian/confluence/6/6.0.2/Dockerfile index 5d6a9c22f..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.0.2/Dockerfile +++ b/linux/atlassian/confluence/6/6.0.2/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.0.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.0.2/Makefile b/linux/atlassian/confluence/6/6.0.2/Makefile index bf0b01cd0..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.0.2/Makefile +++ b/linux/atlassian/confluence/6/6.0.2/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.0.2 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.0.2/docker-compose.yml b/linux/atlassian/confluence/6/6.0.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.0.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.0.3/.env b/linux/atlassian/confluence/6/6.0.3/.env new file mode 100644 index 000000000..f6b5a835a --- /dev/null +++ b/linux/atlassian/confluence/6/6.0.3/.env @@ -0,0 +1,3 @@ + +RELEASE=6.0.3 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.0.3.tar.gz diff --git a/linux/atlassian/confluence/6/6.0.3/Dockerfile b/linux/atlassian/confluence/6/6.0.3/Dockerfile index 477bff4c3..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.0.3/Dockerfile +++ b/linux/atlassian/confluence/6/6.0.3/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.0.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.0.3/Makefile b/linux/atlassian/confluence/6/6.0.3/Makefile index 600150ad2..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.0.3/Makefile +++ b/linux/atlassian/confluence/6/6.0.3/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.0.3 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.0.3/docker-compose.yml b/linux/atlassian/confluence/6/6.0.3/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.0.3/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.0.4/.env b/linux/atlassian/confluence/6/6.0.4/.env new file mode 100644 index 000000000..038f10825 --- /dev/null +++ b/linux/atlassian/confluence/6/6.0.4/.env @@ -0,0 +1,3 @@ + +RELEASE=6.0.4 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.0.4.tar.gz diff --git a/linux/atlassian/confluence/6/6.0.4/Dockerfile b/linux/atlassian/confluence/6/6.0.4/Dockerfile index 67f277e57..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.0.4/Dockerfile +++ b/linux/atlassian/confluence/6/6.0.4/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.0.4 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.0.4/Makefile b/linux/atlassian/confluence/6/6.0.4/Makefile index 295c8f338..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.0.4/Makefile +++ b/linux/atlassian/confluence/6/6.0.4/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.0.4 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.0.4/docker-compose.yml b/linux/atlassian/confluence/6/6.0.4/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.0.4/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.0.5/.env b/linux/atlassian/confluence/6/6.0.5/.env new file mode 100644 index 000000000..bd78d49be --- /dev/null +++ b/linux/atlassian/confluence/6/6.0.5/.env @@ -0,0 +1,3 @@ + +RELEASE=6.0.5 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.0.5.tar.gz diff --git a/linux/atlassian/confluence/6/6.0.5/Dockerfile b/linux/atlassian/confluence/6/6.0.5/Dockerfile index 7402d12b4..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.0.5/Dockerfile +++ b/linux/atlassian/confluence/6/6.0.5/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.0.5 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.0.5/Makefile b/linux/atlassian/confluence/6/6.0.5/Makefile index df010b00f..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.0.5/Makefile +++ b/linux/atlassian/confluence/6/6.0.5/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.0.5 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.0.5/docker-compose.yml b/linux/atlassian/confluence/6/6.0.5/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.0.5/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.0.6/.env b/linux/atlassian/confluence/6/6.0.6/.env new file mode 100644 index 000000000..87e9de1bd --- /dev/null +++ b/linux/atlassian/confluence/6/6.0.6/.env @@ -0,0 +1,3 @@ + +RELEASE=6.0.6 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.0.6.tar.gz diff --git a/linux/atlassian/confluence/6/6.0.6/Dockerfile b/linux/atlassian/confluence/6/6.0.6/Dockerfile index 54aab7128..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.0.6/Dockerfile +++ b/linux/atlassian/confluence/6/6.0.6/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.0.6 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.0.6/Makefile b/linux/atlassian/confluence/6/6.0.6/Makefile index 415f855d5..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.0.6/Makefile +++ b/linux/atlassian/confluence/6/6.0.6/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.0.6 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.0.6/docker-compose.yml b/linux/atlassian/confluence/6/6.0.6/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.0.6/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.0.7/.env b/linux/atlassian/confluence/6/6.0.7/.env new file mode 100644 index 000000000..48b03065a --- /dev/null +++ b/linux/atlassian/confluence/6/6.0.7/.env @@ -0,0 +1,3 @@ + +RELEASE=6.0.7 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.0.7.tar.gz diff --git a/linux/atlassian/confluence/6/6.0.7/Dockerfile b/linux/atlassian/confluence/6/6.0.7/Dockerfile index 62a0c388c..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.0.7/Dockerfile +++ b/linux/atlassian/confluence/6/6.0.7/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.0.7 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.0.7/Makefile b/linux/atlassian/confluence/6/6.0.7/Makefile index 319483387..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.0.7/Makefile +++ b/linux/atlassian/confluence/6/6.0.7/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.0.7 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.0.7/docker-compose.yml b/linux/atlassian/confluence/6/6.0.7/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.0.7/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.1.0/.env b/linux/atlassian/confluence/6/6.1.0/.env new file mode 100644 index 000000000..d2a458f34 --- /dev/null +++ b/linux/atlassian/confluence/6/6.1.0/.env @@ -0,0 +1,3 @@ + +RELEASE=6.1.0 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.1.0.tar.gz diff --git a/linux/atlassian/confluence/6/6.1.0/Dockerfile b/linux/atlassian/confluence/6/6.1.0/Dockerfile index 9e5c98eb9..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.1.0/Dockerfile +++ b/linux/atlassian/confluence/6/6.1.0/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.1.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.1.0/Makefile b/linux/atlassian/confluence/6/6.1.0/Makefile index a85eda5df..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.1.0/Makefile +++ b/linux/atlassian/confluence/6/6.1.0/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.1.0 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.1.0/docker-compose.yml b/linux/atlassian/confluence/6/6.1.0/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.1.0/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.1.1/.env b/linux/atlassian/confluence/6/6.1.1/.env new file mode 100644 index 000000000..283c5b3af --- /dev/null +++ b/linux/atlassian/confluence/6/6.1.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.1.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.1.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.1.1/Dockerfile b/linux/atlassian/confluence/6/6.1.1/Dockerfile index 66b185a7e..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.1.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.1.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.1.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.1.1/Makefile b/linux/atlassian/confluence/6/6.1.1/Makefile index 79cbcdbfb..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.1.1/Makefile +++ b/linux/atlassian/confluence/6/6.1.1/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.1.1 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.1.1/docker-compose.yml b/linux/atlassian/confluence/6/6.1.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.1.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.1.2/.env b/linux/atlassian/confluence/6/6.1.2/.env new file mode 100644 index 000000000..09c8d5557 --- /dev/null +++ b/linux/atlassian/confluence/6/6.1.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.1.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.1.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.1.2/Dockerfile b/linux/atlassian/confluence/6/6.1.2/Dockerfile index 1a8620f8d..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.1.2/Dockerfile +++ b/linux/atlassian/confluence/6/6.1.2/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.1.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.1.2/Makefile b/linux/atlassian/confluence/6/6.1.2/Makefile index 384fecef4..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.1.2/Makefile +++ b/linux/atlassian/confluence/6/6.1.2/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.1.2 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.1.2/docker-compose.yml b/linux/atlassian/confluence/6/6.1.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.1.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.1.3/.env b/linux/atlassian/confluence/6/6.1.3/.env new file mode 100644 index 000000000..1cef7250f --- /dev/null +++ b/linux/atlassian/confluence/6/6.1.3/.env @@ -0,0 +1,3 @@ + +RELEASE=6.1.3 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.1.3.tar.gz diff --git a/linux/atlassian/confluence/6/6.1.3/Dockerfile b/linux/atlassian/confluence/6/6.1.3/Dockerfile index 8bde4a010..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.1.3/Dockerfile +++ b/linux/atlassian/confluence/6/6.1.3/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.1.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.1.3/Makefile b/linux/atlassian/confluence/6/6.1.3/Makefile index 5123e62e9..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.1.3/Makefile +++ b/linux/atlassian/confluence/6/6.1.3/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.1.3 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.1.3/docker-compose.yml b/linux/atlassian/confluence/6/6.1.3/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.1.3/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.1.4/.env b/linux/atlassian/confluence/6/6.1.4/.env new file mode 100644 index 000000000..dcd508b9b --- /dev/null +++ b/linux/atlassian/confluence/6/6.1.4/.env @@ -0,0 +1,3 @@ + +RELEASE=6.1.4 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.1.4.tar.gz diff --git a/linux/atlassian/confluence/6/6.1.4/Dockerfile b/linux/atlassian/confluence/6/6.1.4/Dockerfile index 57b685395..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.1.4/Dockerfile +++ b/linux/atlassian/confluence/6/6.1.4/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.1.4 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.1.4/Makefile b/linux/atlassian/confluence/6/6.1.4/Makefile index 06c417023..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.1.4/Makefile +++ b/linux/atlassian/confluence/6/6.1.4/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.1.4 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.1.4/docker-compose.yml b/linux/atlassian/confluence/6/6.1.4/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.1.4/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.10.0/.env b/linux/atlassian/confluence/6/6.10.0/.env new file mode 100644 index 000000000..7597c1a01 --- /dev/null +++ b/linux/atlassian/confluence/6/6.10.0/.env @@ -0,0 +1,3 @@ + +RELEASE=6.10.0 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.10.0.tar.gz diff --git a/linux/atlassian/confluence/6/6.10.0/Dockerfile b/linux/atlassian/confluence/6/6.10.0/Dockerfile index 4ad1fde3c..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.10.0/Dockerfile +++ b/linux/atlassian/confluence/6/6.10.0/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.10.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.10.0/Makefile b/linux/atlassian/confluence/6/6.10.0/Makefile index 51889d9ce..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.10.0/Makefile +++ b/linux/atlassian/confluence/6/6.10.0/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.10.0 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.10.0/docker-compose.yml b/linux/atlassian/confluence/6/6.10.0/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.10.0/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.10.1/.env b/linux/atlassian/confluence/6/6.10.1/.env new file mode 100644 index 000000000..1d8045327 --- /dev/null +++ b/linux/atlassian/confluence/6/6.10.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.10.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.10.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.10.1/Dockerfile b/linux/atlassian/confluence/6/6.10.1/Dockerfile index 03804167e..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.10.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.10.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.10.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.10.1/Makefile b/linux/atlassian/confluence/6/6.10.1/Makefile index 2075e3608..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.10.1/Makefile +++ b/linux/atlassian/confluence/6/6.10.1/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.10.1 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.10.1/docker-compose.yml b/linux/atlassian/confluence/6/6.10.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.10.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.10.2/.env b/linux/atlassian/confluence/6/6.10.2/.env new file mode 100644 index 000000000..8af54d091 --- /dev/null +++ b/linux/atlassian/confluence/6/6.10.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.10.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.10.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.10.2/Dockerfile b/linux/atlassian/confluence/6/6.10.2/Dockerfile index b7a0eabd0..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.10.2/Dockerfile +++ b/linux/atlassian/confluence/6/6.10.2/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.10.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.10.2/Makefile b/linux/atlassian/confluence/6/6.10.2/Makefile index 1e0cf78ce..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.10.2/Makefile +++ b/linux/atlassian/confluence/6/6.10.2/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.10.2 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.10.2/docker-compose.yml b/linux/atlassian/confluence/6/6.10.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.10.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.10.3/.env b/linux/atlassian/confluence/6/6.10.3/.env new file mode 100644 index 000000000..84c40b316 --- /dev/null +++ b/linux/atlassian/confluence/6/6.10.3/.env @@ -0,0 +1,3 @@ + +RELEASE=6.10.3 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.10.3.tar.gz diff --git a/linux/atlassian/confluence/6/6.10.3/Dockerfile b/linux/atlassian/confluence/6/6.10.3/Dockerfile index 0f996919e..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.10.3/Dockerfile +++ b/linux/atlassian/confluence/6/6.10.3/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.10.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.10.3/Makefile b/linux/atlassian/confluence/6/6.10.3/Makefile index 3efab142b..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.10.3/Makefile +++ b/linux/atlassian/confluence/6/6.10.3/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.10.3 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.10.3/docker-compose.yml b/linux/atlassian/confluence/6/6.10.3/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.10.3/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.11.0/.env b/linux/atlassian/confluence/6/6.11.0/.env new file mode 100644 index 000000000..dfc8f71f0 --- /dev/null +++ b/linux/atlassian/confluence/6/6.11.0/.env @@ -0,0 +1,3 @@ + +RELEASE=6.11.0 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.11.0.tar.gz diff --git a/linux/atlassian/confluence/6/6.11.0/Dockerfile b/linux/atlassian/confluence/6/6.11.0/Dockerfile index a398499dc..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.11.0/Dockerfile +++ b/linux/atlassian/confluence/6/6.11.0/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.11.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.11.0/Makefile b/linux/atlassian/confluence/6/6.11.0/Makefile index 91ac02ec4..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.11.0/Makefile +++ b/linux/atlassian/confluence/6/6.11.0/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.11.0 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.11.0/docker-compose.yml b/linux/atlassian/confluence/6/6.11.0/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.11.0/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.11.1/.env b/linux/atlassian/confluence/6/6.11.1/.env new file mode 100644 index 000000000..30cf0836b --- /dev/null +++ b/linux/atlassian/confluence/6/6.11.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.11.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.11.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.11.1/Dockerfile b/linux/atlassian/confluence/6/6.11.1/Dockerfile index b9f04c9fa..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.11.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.11.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.11.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.11.1/Makefile b/linux/atlassian/confluence/6/6.11.1/Makefile index 91b13f5a3..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.11.1/Makefile +++ b/linux/atlassian/confluence/6/6.11.1/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.11.1 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.11.1/docker-compose.yml b/linux/atlassian/confluence/6/6.11.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.11.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.11.2/.env b/linux/atlassian/confluence/6/6.11.2/.env new file mode 100644 index 000000000..addc1e4c3 --- /dev/null +++ b/linux/atlassian/confluence/6/6.11.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.11.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.11.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.11.2/Dockerfile b/linux/atlassian/confluence/6/6.11.2/Dockerfile index 68b11e92e..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.11.2/Dockerfile +++ b/linux/atlassian/confluence/6/6.11.2/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.11.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.11.2/Makefile b/linux/atlassian/confluence/6/6.11.2/Makefile index 33190fa54..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.11.2/Makefile +++ b/linux/atlassian/confluence/6/6.11.2/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.11.2 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.11.2/docker-compose.yml b/linux/atlassian/confluence/6/6.11.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.11.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.12.0/.env b/linux/atlassian/confluence/6/6.12.0/.env new file mode 100644 index 000000000..4f0b1a0e2 --- /dev/null +++ b/linux/atlassian/confluence/6/6.12.0/.env @@ -0,0 +1,3 @@ + +RELEASE=6.12.0 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.12.0.tar.gz diff --git a/linux/atlassian/confluence/6/6.12.0/Dockerfile b/linux/atlassian/confluence/6/6.12.0/Dockerfile index 1dc6fad00..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.12.0/Dockerfile +++ b/linux/atlassian/confluence/6/6.12.0/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.12.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.12.0/Makefile b/linux/atlassian/confluence/6/6.12.0/Makefile index 8cda2e8c5..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.12.0/Makefile +++ b/linux/atlassian/confluence/6/6.12.0/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.12.0 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.12.0/docker-compose.yml b/linux/atlassian/confluence/6/6.12.0/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.12.0/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.12.1/.env b/linux/atlassian/confluence/6/6.12.1/.env new file mode 100644 index 000000000..f62fa52bd --- /dev/null +++ b/linux/atlassian/confluence/6/6.12.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.12.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.12.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.12.1/Dockerfile b/linux/atlassian/confluence/6/6.12.1/Dockerfile index 4bbf92616..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.12.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.12.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.12.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.12.1/Makefile b/linux/atlassian/confluence/6/6.12.1/Makefile index 0c8f696cd..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.12.1/Makefile +++ b/linux/atlassian/confluence/6/6.12.1/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.12.1 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.12.1/docker-compose.yml b/linux/atlassian/confluence/6/6.12.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.12.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.12.2/.env b/linux/atlassian/confluence/6/6.12.2/.env new file mode 100644 index 000000000..05734d6e7 --- /dev/null +++ b/linux/atlassian/confluence/6/6.12.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.12.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.12.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.12.2/Dockerfile b/linux/atlassian/confluence/6/6.12.2/Dockerfile index 5371f2910..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.12.2/Dockerfile +++ b/linux/atlassian/confluence/6/6.12.2/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.12.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.12.2/Makefile b/linux/atlassian/confluence/6/6.12.2/Makefile index 816ec3bd7..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.12.2/Makefile +++ b/linux/atlassian/confluence/6/6.12.2/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.12.2 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.12.2/docker-compose.yml b/linux/atlassian/confluence/6/6.12.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.12.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.12.3/.env b/linux/atlassian/confluence/6/6.12.3/.env new file mode 100644 index 000000000..ef62b7f81 --- /dev/null +++ b/linux/atlassian/confluence/6/6.12.3/.env @@ -0,0 +1,3 @@ + +RELEASE=6.12.3 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.12.3.tar.gz diff --git a/linux/atlassian/confluence/6/6.12.3/Dockerfile b/linux/atlassian/confluence/6/6.12.3/Dockerfile index 754b5b423..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.12.3/Dockerfile +++ b/linux/atlassian/confluence/6/6.12.3/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.12.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.12.3/Makefile b/linux/atlassian/confluence/6/6.12.3/Makefile index bcc05628a..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.12.3/Makefile +++ b/linux/atlassian/confluence/6/6.12.3/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.12.3 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.12.3/docker-compose.yml b/linux/atlassian/confluence/6/6.12.3/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.12.3/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.12.4/.env b/linux/atlassian/confluence/6/6.12.4/.env new file mode 100644 index 000000000..73e973274 --- /dev/null +++ b/linux/atlassian/confluence/6/6.12.4/.env @@ -0,0 +1,3 @@ + +RELEASE=6.12.4 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.12.4.tar.gz diff --git a/linux/atlassian/confluence/6/6.12.4/Dockerfile b/linux/atlassian/confluence/6/6.12.4/Dockerfile index e19663666..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.12.4/Dockerfile +++ b/linux/atlassian/confluence/6/6.12.4/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.12.4 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.12.4/Makefile b/linux/atlassian/confluence/6/6.12.4/Makefile index 48b1ff9b2..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.12.4/Makefile +++ b/linux/atlassian/confluence/6/6.12.4/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.12.4 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.12.4/docker-compose.yml b/linux/atlassian/confluence/6/6.12.4/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.12.4/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.0/.env b/linux/atlassian/confluence/6/6.13.0/.env new file mode 100644 index 000000000..b65d7830f --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.0/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.0 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.0.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.0/Dockerfile b/linux/atlassian/confluence/6/6.13.0/Dockerfile index ccb8e85b9..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.13.0/Dockerfile +++ b/linux/atlassian/confluence/6/6.13.0/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.13.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.13.0/Makefile b/linux/atlassian/confluence/6/6.13.0/Makefile index bef0eb44c..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.13.0/Makefile +++ b/linux/atlassian/confluence/6/6.13.0/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.13.0 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.0/docker-compose.yml b/linux/atlassian/confluence/6/6.13.0/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.0/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.1/.env b/linux/atlassian/confluence/6/6.13.1/.env new file mode 100644 index 000000000..cfcc9bc6c --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.1/Dockerfile b/linux/atlassian/confluence/6/6.13.1/Dockerfile index d443befb1..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.13.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.13.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.13.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.13.1/Makefile b/linux/atlassian/confluence/6/6.13.1/Makefile index 59ba9a277..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.13.1/Makefile +++ b/linux/atlassian/confluence/6/6.13.1/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.13.1 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.1/docker-compose.yml b/linux/atlassian/confluence/6/6.13.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.10/.env b/linux/atlassian/confluence/6/6.13.10/.env new file mode 100644 index 000000000..5bfc2adb3 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.10/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.10 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.10.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.10/Dockerfile b/linux/atlassian/confluence/6/6.13.10/Dockerfile index 819172b1e..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.13.10/Dockerfile +++ b/linux/atlassian/confluence/6/6.13.10/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.13.10 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.13.10/Makefile b/linux/atlassian/confluence/6/6.13.10/Makefile index ae06f9246..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.13.10/Makefile +++ b/linux/atlassian/confluence/6/6.13.10/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.13.10 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.10/docker-compose.yml b/linux/atlassian/confluence/6/6.13.10/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.10/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.11/.env b/linux/atlassian/confluence/6/6.13.11/.env new file mode 100644 index 000000000..981b1cca6 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.11/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.11 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.11.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.11/Dockerfile b/linux/atlassian/confluence/6/6.13.11/Dockerfile index 9f2dec9ed..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.13.11/Dockerfile +++ b/linux/atlassian/confluence/6/6.13.11/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.13.11 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.13.11/Makefile b/linux/atlassian/confluence/6/6.13.11/Makefile index 01b6b55e6..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.13.11/Makefile +++ b/linux/atlassian/confluence/6/6.13.11/Makefile @@ -1,5 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.13.11 . - docker push epicmorg/confluence:6.13.11 +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.11/docker-compose.yml b/linux/atlassian/confluence/6/6.13.11/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.11/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.12/.env b/linux/atlassian/confluence/6/6.13.12/.env new file mode 100644 index 000000000..1b88ce797 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.12/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.12 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.12.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.12/Dockerfile b/linux/atlassian/confluence/6/6.13.12/Dockerfile new file mode 100644 index 000000000..f3e6e40c1 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.12/Dockerfile @@ -0,0 +1,49 @@ +FROM epicmorg/prod:jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html +ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence +ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence + +VOLUME ["${CONFLUENCE_HOME}"] +WORKDIR $CONFLUENCE_HOME + +# Expose HTTP and Synchrony ports +EXPOSE 8090 +EXPOSE 8091 + +################################################################## +# Installing +################################################################## +RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ + && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \ + && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/linux/atlassian/confluence/6/6.13.12/Makefile b/linux/atlassian/confluence/6/6.13.12/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.12/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.12/docker-compose.yml b/linux/atlassian/confluence/6/6.13.12/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.12/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.12/entrypoint.sh b/linux/atlassian/confluence/6/6.13.12/entrypoint.sh new file mode 100644 index 000000000..250fc031a --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.12/entrypoint.sh @@ -0,0 +1,39 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export CATALINA_OPTS + + +# Start Confluence as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${CONFLUENCE_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${CONFLUENCE_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${CONFLUENCE_HOME}" + fi + # Now drop privileges + exec su -s /bin/bash "${RUN_USER}" -c "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh $@" +else + exec "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh" "$@" +fi diff --git a/linux/atlassian/confluence/6/6.13.13/.env b/linux/atlassian/confluence/6/6.13.13/.env new file mode 100644 index 000000000..2413a6b69 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.13/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.13 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.13.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.13/Dockerfile b/linux/atlassian/confluence/6/6.13.13/Dockerfile new file mode 100644 index 000000000..f3e6e40c1 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.13/Dockerfile @@ -0,0 +1,49 @@ +FROM epicmorg/prod:jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html +ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence +ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence + +VOLUME ["${CONFLUENCE_HOME}"] +WORKDIR $CONFLUENCE_HOME + +# Expose HTTP and Synchrony ports +EXPOSE 8090 +EXPOSE 8091 + +################################################################## +# Installing +################################################################## +RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ + && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \ + && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/linux/atlassian/confluence/6/6.13.13/Makefile b/linux/atlassian/confluence/6/6.13.13/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.13/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.13/docker-compose.yml b/linux/atlassian/confluence/6/6.13.13/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.13/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.13/entrypoint.sh b/linux/atlassian/confluence/6/6.13.13/entrypoint.sh new file mode 100644 index 000000000..250fc031a --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.13/entrypoint.sh @@ -0,0 +1,39 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export CATALINA_OPTS + + +# Start Confluence as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${CONFLUENCE_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${CONFLUENCE_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${CONFLUENCE_HOME}" + fi + # Now drop privileges + exec su -s /bin/bash "${RUN_USER}" -c "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh $@" +else + exec "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh" "$@" +fi diff --git a/linux/atlassian/confluence/6/6.13.15/.env b/linux/atlassian/confluence/6/6.13.15/.env new file mode 100644 index 000000000..bfb7c3517 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.15/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.15 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.15.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.15/Dockerfile b/linux/atlassian/confluence/6/6.13.15/Dockerfile new file mode 100644 index 000000000..f3e6e40c1 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.15/Dockerfile @@ -0,0 +1,49 @@ +FROM epicmorg/prod:jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html +ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence +ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence + +VOLUME ["${CONFLUENCE_HOME}"] +WORKDIR $CONFLUENCE_HOME + +# Expose HTTP and Synchrony ports +EXPOSE 8090 +EXPOSE 8091 + +################################################################## +# Installing +################################################################## +RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ + && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \ + && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/linux/atlassian/confluence/6/6.13.15/Makefile b/linux/atlassian/confluence/6/6.13.15/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.15/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.15/docker-compose.yml b/linux/atlassian/confluence/6/6.13.15/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.15/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.15/entrypoint.sh b/linux/atlassian/confluence/6/6.13.15/entrypoint.sh new file mode 100644 index 000000000..250fc031a --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.15/entrypoint.sh @@ -0,0 +1,39 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export CATALINA_OPTS + + +# Start Confluence as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${CONFLUENCE_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${CONFLUENCE_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${CONFLUENCE_HOME}" + fi + # Now drop privileges + exec su -s /bin/bash "${RUN_USER}" -c "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh $@" +else + exec "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh" "$@" +fi diff --git a/linux/atlassian/confluence/6/6.13.17/.env b/linux/atlassian/confluence/6/6.13.17/.env new file mode 100644 index 000000000..4105da19e --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.17/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.17 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.17.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.17/Dockerfile b/linux/atlassian/confluence/6/6.13.17/Dockerfile new file mode 100644 index 000000000..f3e6e40c1 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.17/Dockerfile @@ -0,0 +1,49 @@ +FROM epicmorg/prod:jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html +ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence +ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence + +VOLUME ["${CONFLUENCE_HOME}"] +WORKDIR $CONFLUENCE_HOME + +# Expose HTTP and Synchrony ports +EXPOSE 8090 +EXPOSE 8091 + +################################################################## +# Installing +################################################################## +RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ + && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \ + && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/linux/atlassian/confluence/6/6.13.17/Makefile b/linux/atlassian/confluence/6/6.13.17/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.17/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.17/docker-compose.yml b/linux/atlassian/confluence/6/6.13.17/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.17/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.17/entrypoint.sh b/linux/atlassian/confluence/6/6.13.17/entrypoint.sh new file mode 100644 index 000000000..250fc031a --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.17/entrypoint.sh @@ -0,0 +1,39 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export CATALINA_OPTS + + +# Start Confluence as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${CONFLUENCE_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${CONFLUENCE_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${CONFLUENCE_HOME}" + fi + # Now drop privileges + exec su -s /bin/bash "${RUN_USER}" -c "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh $@" +else + exec "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh" "$@" +fi diff --git a/linux/atlassian/confluence/6/6.13.18/.env b/linux/atlassian/confluence/6/6.13.18/.env new file mode 100644 index 000000000..5ea664f78 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.18/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.18 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.18.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.18/Dockerfile b/linux/atlassian/confluence/6/6.13.18/Dockerfile new file mode 100644 index 000000000..f3e6e40c1 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.18/Dockerfile @@ -0,0 +1,49 @@ +FROM epicmorg/prod:jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html +ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence +ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence + +VOLUME ["${CONFLUENCE_HOME}"] +WORKDIR $CONFLUENCE_HOME + +# Expose HTTP and Synchrony ports +EXPOSE 8090 +EXPOSE 8091 + +################################################################## +# Installing +################################################################## +RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ + && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \ + && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/linux/atlassian/confluence/6/6.13.18/Makefile b/linux/atlassian/confluence/6/6.13.18/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.18/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.18/docker-compose.yml b/linux/atlassian/confluence/6/6.13.18/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.18/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.18/entrypoint.sh b/linux/atlassian/confluence/6/6.13.18/entrypoint.sh new file mode 100644 index 000000000..250fc031a --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.18/entrypoint.sh @@ -0,0 +1,39 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export CATALINA_OPTS + + +# Start Confluence as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${CONFLUENCE_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${CONFLUENCE_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${CONFLUENCE_HOME}" + fi + # Now drop privileges + exec su -s /bin/bash "${RUN_USER}" -c "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh $@" +else + exec "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh" "$@" +fi diff --git a/linux/atlassian/confluence/6/6.13.19/.env b/linux/atlassian/confluence/6/6.13.19/.env new file mode 100644 index 000000000..d65140659 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.19/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.19 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.19.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.19/Dockerfile b/linux/atlassian/confluence/6/6.13.19/Dockerfile new file mode 100644 index 000000000..f3e6e40c1 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.19/Dockerfile @@ -0,0 +1,49 @@ +FROM epicmorg/prod:jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html +ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence +ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence + +VOLUME ["${CONFLUENCE_HOME}"] +WORKDIR $CONFLUENCE_HOME + +# Expose HTTP and Synchrony ports +EXPOSE 8090 +EXPOSE 8091 + +################################################################## +# Installing +################################################################## +RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ + && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \ + && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/linux/atlassian/confluence/6/6.13.19/Makefile b/linux/atlassian/confluence/6/6.13.19/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.19/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.19/docker-compose.yml b/linux/atlassian/confluence/6/6.13.19/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.19/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.19/entrypoint.sh b/linux/atlassian/confluence/6/6.13.19/entrypoint.sh new file mode 100644 index 000000000..250fc031a --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.19/entrypoint.sh @@ -0,0 +1,39 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export CATALINA_OPTS + + +# Start Confluence as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${CONFLUENCE_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${CONFLUENCE_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${CONFLUENCE_HOME}" + fi + # Now drop privileges + exec su -s /bin/bash "${RUN_USER}" -c "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh $@" +else + exec "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh" "$@" +fi diff --git a/linux/atlassian/confluence/6/6.13.2/.env b/linux/atlassian/confluence/6/6.13.2/.env new file mode 100644 index 000000000..68db04d3e --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.2/Dockerfile b/linux/atlassian/confluence/6/6.13.2/Dockerfile index d70d32f7e..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.13.2/Dockerfile +++ b/linux/atlassian/confluence/6/6.13.2/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.13.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.13.2/Makefile b/linux/atlassian/confluence/6/6.13.2/Makefile index 0d0a349b3..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.13.2/Makefile +++ b/linux/atlassian/confluence/6/6.13.2/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.13.2 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.2/docker-compose.yml b/linux/atlassian/confluence/6/6.13.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.20/.env b/linux/atlassian/confluence/6/6.13.20/.env new file mode 100644 index 000000000..096ae154e --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.20/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.20 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.20.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.20/Dockerfile b/linux/atlassian/confluence/6/6.13.20/Dockerfile new file mode 100644 index 000000000..f3e6e40c1 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.20/Dockerfile @@ -0,0 +1,49 @@ +FROM epicmorg/prod:jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html +ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence +ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence + +VOLUME ["${CONFLUENCE_HOME}"] +WORKDIR $CONFLUENCE_HOME + +# Expose HTTP and Synchrony ports +EXPOSE 8090 +EXPOSE 8091 + +################################################################## +# Installing +################################################################## +RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ + && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \ + && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/linux/atlassian/confluence/6/6.13.20/Makefile b/linux/atlassian/confluence/6/6.13.20/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.20/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.20/docker-compose.yml b/linux/atlassian/confluence/6/6.13.20/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.20/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.20/entrypoint.sh b/linux/atlassian/confluence/6/6.13.20/entrypoint.sh new file mode 100644 index 000000000..250fc031a --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.20/entrypoint.sh @@ -0,0 +1,39 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export CATALINA_OPTS + + +# Start Confluence as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${CONFLUENCE_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${CONFLUENCE_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${CONFLUENCE_HOME}" + fi + # Now drop privileges + exec su -s /bin/bash "${RUN_USER}" -c "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh $@" +else + exec "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh" "$@" +fi diff --git a/linux/atlassian/confluence/6/6.13.3/.env b/linux/atlassian/confluence/6/6.13.3/.env new file mode 100644 index 000000000..145f9f2ba --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.3/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.3 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.3.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.3/Dockerfile b/linux/atlassian/confluence/6/6.13.3/Dockerfile index 9b3339a01..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.13.3/Dockerfile +++ b/linux/atlassian/confluence/6/6.13.3/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.13.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.13.3/Makefile b/linux/atlassian/confluence/6/6.13.3/Makefile index b5dd0c1af..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.13.3/Makefile +++ b/linux/atlassian/confluence/6/6.13.3/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.13.3 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.3/docker-compose.yml b/linux/atlassian/confluence/6/6.13.3/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.3/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.4/.env b/linux/atlassian/confluence/6/6.13.4/.env new file mode 100644 index 000000000..9988fa30a --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.4/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.4 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.4.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.4/Dockerfile b/linux/atlassian/confluence/6/6.13.4/Dockerfile index 754b6e94f..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.13.4/Dockerfile +++ b/linux/atlassian/confluence/6/6.13.4/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.13.4 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.13.4/Makefile b/linux/atlassian/confluence/6/6.13.4/Makefile index 151d74550..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.13.4/Makefile +++ b/linux/atlassian/confluence/6/6.13.4/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.13.4 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.4/docker-compose.yml b/linux/atlassian/confluence/6/6.13.4/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.4/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.5/.env b/linux/atlassian/confluence/6/6.13.5/.env new file mode 100644 index 000000000..9b9d4721a --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.5/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.5 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.5.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.5/Dockerfile b/linux/atlassian/confluence/6/6.13.5/Dockerfile index a3a26f6c1..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.13.5/Dockerfile +++ b/linux/atlassian/confluence/6/6.13.5/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.13.5 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.13.5/Makefile b/linux/atlassian/confluence/6/6.13.5/Makefile index 51b8004b9..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.13.5/Makefile +++ b/linux/atlassian/confluence/6/6.13.5/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.13.5 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.5/docker-compose.yml b/linux/atlassian/confluence/6/6.13.5/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.5/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.6/.env b/linux/atlassian/confluence/6/6.13.6/.env new file mode 100644 index 000000000..c002c4867 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.6/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.6 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.6.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.6/Dockerfile b/linux/atlassian/confluence/6/6.13.6/Dockerfile index e7ddfccfd..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.13.6/Dockerfile +++ b/linux/atlassian/confluence/6/6.13.6/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.13.6 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.13.6/Makefile b/linux/atlassian/confluence/6/6.13.6/Makefile index f97a67aac..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.13.6/Makefile +++ b/linux/atlassian/confluence/6/6.13.6/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.13.6 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.6/docker-compose.yml b/linux/atlassian/confluence/6/6.13.6/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.6/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.7/.env b/linux/atlassian/confluence/6/6.13.7/.env new file mode 100644 index 000000000..179f1eb06 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.7/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.7 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.7.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.7/Dockerfile b/linux/atlassian/confluence/6/6.13.7/Dockerfile index ec43a52b7..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.13.7/Dockerfile +++ b/linux/atlassian/confluence/6/6.13.7/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.13.7 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.13.7/Makefile b/linux/atlassian/confluence/6/6.13.7/Makefile index 67ea1401b..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.13.7/Makefile +++ b/linux/atlassian/confluence/6/6.13.7/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.13.7 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.7/docker-compose.yml b/linux/atlassian/confluence/6/6.13.7/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.7/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.8/.env b/linux/atlassian/confluence/6/6.13.8/.env new file mode 100644 index 000000000..a9b55e9ad --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.8/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.8 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.8.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.8/Dockerfile b/linux/atlassian/confluence/6/6.13.8/Dockerfile index f31478c3f..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.13.8/Dockerfile +++ b/linux/atlassian/confluence/6/6.13.8/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.13.8 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.13.8/Makefile b/linux/atlassian/confluence/6/6.13.8/Makefile index 40f704f85..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.13.8/Makefile +++ b/linux/atlassian/confluence/6/6.13.8/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.13.8 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.8/docker-compose.yml b/linux/atlassian/confluence/6/6.13.8/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.8/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.13.9/.env b/linux/atlassian/confluence/6/6.13.9/.env new file mode 100644 index 000000000..5144ea9d9 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.9/.env @@ -0,0 +1,3 @@ + +RELEASE=6.13.9 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.13.9.tar.gz diff --git a/linux/atlassian/confluence/6/6.13.9/Dockerfile b/linux/atlassian/confluence/6/6.13.9/Dockerfile index 23d27cfbd..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.13.9/Dockerfile +++ b/linux/atlassian/confluence/6/6.13.9/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.13.9 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.13.9/Makefile b/linux/atlassian/confluence/6/6.13.9/Makefile index 123908ce1..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.13.9/Makefile +++ b/linux/atlassian/confluence/6/6.13.9/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.13.9 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.13.9/docker-compose.yml b/linux/atlassian/confluence/6/6.13.9/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.13.9/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.14.0/.env b/linux/atlassian/confluence/6/6.14.0/.env new file mode 100644 index 000000000..09182cd6d --- /dev/null +++ b/linux/atlassian/confluence/6/6.14.0/.env @@ -0,0 +1,3 @@ + +RELEASE=6.14.0 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.14.0.tar.gz diff --git a/linux/atlassian/confluence/6/6.14.0/Dockerfile b/linux/atlassian/confluence/6/6.14.0/Dockerfile index 75528b59f..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.14.0/Dockerfile +++ b/linux/atlassian/confluence/6/6.14.0/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.14.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.14.0/Makefile b/linux/atlassian/confluence/6/6.14.0/Makefile index a108c8aac..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.14.0/Makefile +++ b/linux/atlassian/confluence/6/6.14.0/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.14.0 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.14.0/docker-compose.yml b/linux/atlassian/confluence/6/6.14.0/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.14.0/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.14.1/.env b/linux/atlassian/confluence/6/6.14.1/.env new file mode 100644 index 000000000..9fba158cb --- /dev/null +++ b/linux/atlassian/confluence/6/6.14.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.14.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.14.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.14.1/Dockerfile b/linux/atlassian/confluence/6/6.14.1/Dockerfile index 1afce19ac..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.14.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.14.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.14.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.14.1/Makefile b/linux/atlassian/confluence/6/6.14.1/Makefile index 10c887145..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.14.1/Makefile +++ b/linux/atlassian/confluence/6/6.14.1/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.14.1 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.14.1/docker-compose.yml b/linux/atlassian/confluence/6/6.14.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.14.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.14.2/.env b/linux/atlassian/confluence/6/6.14.2/.env new file mode 100644 index 000000000..58ca325d9 --- /dev/null +++ b/linux/atlassian/confluence/6/6.14.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.14.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.14.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.14.2/Dockerfile b/linux/atlassian/confluence/6/6.14.2/Dockerfile index 9c09f9aa0..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.14.2/Dockerfile +++ b/linux/atlassian/confluence/6/6.14.2/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.14.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.14.2/Makefile b/linux/atlassian/confluence/6/6.14.2/Makefile index 20d0be562..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.14.2/Makefile +++ b/linux/atlassian/confluence/6/6.14.2/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.14.2 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.14.2/docker-compose.yml b/linux/atlassian/confluence/6/6.14.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.14.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.14.3/.env b/linux/atlassian/confluence/6/6.14.3/.env new file mode 100644 index 000000000..9656268ed --- /dev/null +++ b/linux/atlassian/confluence/6/6.14.3/.env @@ -0,0 +1,3 @@ + +RELEASE=6.14.3 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.14.3.tar.gz diff --git a/linux/atlassian/confluence/6/6.14.3/Dockerfile b/linux/atlassian/confluence/6/6.14.3/Dockerfile index 09045771f..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.14.3/Dockerfile +++ b/linux/atlassian/confluence/6/6.14.3/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.14.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.14.3/Makefile b/linux/atlassian/confluence/6/6.14.3/Makefile index 64d461d63..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.14.3/Makefile +++ b/linux/atlassian/confluence/6/6.14.3/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.14.3 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.14.3/docker-compose.yml b/linux/atlassian/confluence/6/6.14.3/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.14.3/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.15.1/.env b/linux/atlassian/confluence/6/6.15.1/.env new file mode 100644 index 000000000..88c23614e --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.15.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.15.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.15.1/Dockerfile b/linux/atlassian/confluence/6/6.15.1/Dockerfile index b4760d22a..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.15.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.15.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.15.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.15.1/Makefile b/linux/atlassian/confluence/6/6.15.1/Makefile index 8562af6a9..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.15.1/Makefile +++ b/linux/atlassian/confluence/6/6.15.1/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.15.1 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.15.1/docker-compose.yml b/linux/atlassian/confluence/6/6.15.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.15.10/.env b/linux/atlassian/confluence/6/6.15.10/.env new file mode 100644 index 000000000..bc840adbd --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.10/.env @@ -0,0 +1,3 @@ + +RELEASE=6.15.10 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.15.10.tar.gz diff --git a/linux/atlassian/confluence/6/6.15.10/Dockerfile b/linux/atlassian/confluence/6/6.15.10/Dockerfile index 390873ab3..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.15.10/Dockerfile +++ b/linux/atlassian/confluence/6/6.15.10/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.15.10 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.15.10/Makefile b/linux/atlassian/confluence/6/6.15.10/Makefile index ac511814c..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.15.10/Makefile +++ b/linux/atlassian/confluence/6/6.15.10/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.15.10 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.15.10/docker-compose.yml b/linux/atlassian/confluence/6/6.15.10/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.10/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.15.2/.env b/linux/atlassian/confluence/6/6.15.2/.env new file mode 100644 index 000000000..bf60686a8 --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.15.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.15.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.15.2/Dockerfile b/linux/atlassian/confluence/6/6.15.2/Dockerfile index 8f3f731e4..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.15.2/Dockerfile +++ b/linux/atlassian/confluence/6/6.15.2/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.15.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.15.2/Makefile b/linux/atlassian/confluence/6/6.15.2/Makefile index 49f7f4b47..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.15.2/Makefile +++ b/linux/atlassian/confluence/6/6.15.2/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.15.2 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.15.2/docker-compose.yml b/linux/atlassian/confluence/6/6.15.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.15.4/.env b/linux/atlassian/confluence/6/6.15.4/.env new file mode 100644 index 000000000..9b18513bb --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.4/.env @@ -0,0 +1,3 @@ + +RELEASE=6.15.4 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.15.4.tar.gz diff --git a/linux/atlassian/confluence/6/6.15.4/Dockerfile b/linux/atlassian/confluence/6/6.15.4/Dockerfile index bd22b9524..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.15.4/Dockerfile +++ b/linux/atlassian/confluence/6/6.15.4/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.15.4 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.15.4/Makefile b/linux/atlassian/confluence/6/6.15.4/Makefile index b578eca08..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.15.4/Makefile +++ b/linux/atlassian/confluence/6/6.15.4/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.15.4 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.15.4/docker-compose.yml b/linux/atlassian/confluence/6/6.15.4/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.4/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.15.6/.env b/linux/atlassian/confluence/6/6.15.6/.env new file mode 100644 index 000000000..d609b17a0 --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.6/.env @@ -0,0 +1,3 @@ + +RELEASE=6.15.6 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.15.6.tar.gz diff --git a/linux/atlassian/confluence/6/6.15.6/Dockerfile b/linux/atlassian/confluence/6/6.15.6/Dockerfile index 7ded10ca3..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.15.6/Dockerfile +++ b/linux/atlassian/confluence/6/6.15.6/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.15.6 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.15.6/Makefile b/linux/atlassian/confluence/6/6.15.6/Makefile index 960c9cff3..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.15.6/Makefile +++ b/linux/atlassian/confluence/6/6.15.6/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.15.6 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.15.6/docker-compose.yml b/linux/atlassian/confluence/6/6.15.6/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.6/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.15.7/.env b/linux/atlassian/confluence/6/6.15.7/.env new file mode 100644 index 000000000..bf91194e6 --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.7/.env @@ -0,0 +1,3 @@ + +RELEASE=6.15.7 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.15.7.tar.gz diff --git a/linux/atlassian/confluence/6/6.15.7/Dockerfile b/linux/atlassian/confluence/6/6.15.7/Dockerfile index fd475818d..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.15.7/Dockerfile +++ b/linux/atlassian/confluence/6/6.15.7/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.15.7 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.15.7/Makefile b/linux/atlassian/confluence/6/6.15.7/Makefile index c0d45c8e4..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.15.7/Makefile +++ b/linux/atlassian/confluence/6/6.15.7/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.15.7 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.15.7/docker-compose.yml b/linux/atlassian/confluence/6/6.15.7/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.7/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.15.8/.env b/linux/atlassian/confluence/6/6.15.8/.env new file mode 100644 index 000000000..55abf8ab9 --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.8/.env @@ -0,0 +1,3 @@ + +RELEASE=6.15.8 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.15.8.tar.gz diff --git a/linux/atlassian/confluence/6/6.15.8/Dockerfile b/linux/atlassian/confluence/6/6.15.8/Dockerfile index 88eb7769b..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.15.8/Dockerfile +++ b/linux/atlassian/confluence/6/6.15.8/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.15.8 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.15.8/Makefile b/linux/atlassian/confluence/6/6.15.8/Makefile index daca62370..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.15.8/Makefile +++ b/linux/atlassian/confluence/6/6.15.8/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.15.8 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.15.8/docker-compose.yml b/linux/atlassian/confluence/6/6.15.8/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.8/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.15.9/.env b/linux/atlassian/confluence/6/6.15.9/.env new file mode 100644 index 000000000..4b779c9dc --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.9/.env @@ -0,0 +1,3 @@ + +RELEASE=6.15.9 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.15.9.tar.gz diff --git a/linux/atlassian/confluence/6/6.15.9/Dockerfile b/linux/atlassian/confluence/6/6.15.9/Dockerfile index d3ce10616..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.15.9/Dockerfile +++ b/linux/atlassian/confluence/6/6.15.9/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.15.9 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.15.9/Makefile b/linux/atlassian/confluence/6/6.15.9/Makefile index 1383a8baf..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.15.9/Makefile +++ b/linux/atlassian/confluence/6/6.15.9/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.15.9 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.15.9/docker-compose.yml b/linux/atlassian/confluence/6/6.15.9/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.15.9/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.2.0/.env b/linux/atlassian/confluence/6/6.2.0/.env new file mode 100644 index 000000000..b26238429 --- /dev/null +++ b/linux/atlassian/confluence/6/6.2.0/.env @@ -0,0 +1,3 @@ + +RELEASE=6.2.0 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.2.0.tar.gz diff --git a/linux/atlassian/confluence/6/6.2.0/Dockerfile b/linux/atlassian/confluence/6/6.2.0/Dockerfile index 2918977a7..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.2.0/Dockerfile +++ b/linux/atlassian/confluence/6/6.2.0/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.2.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.2.0/Makefile b/linux/atlassian/confluence/6/6.2.0/Makefile index 64a2b71a2..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.2.0/Makefile +++ b/linux/atlassian/confluence/6/6.2.0/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.2.0 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.2.0/docker-compose.yml b/linux/atlassian/confluence/6/6.2.0/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.2.0/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.2.1/.env b/linux/atlassian/confluence/6/6.2.1/.env new file mode 100644 index 000000000..f99324d92 --- /dev/null +++ b/linux/atlassian/confluence/6/6.2.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.2.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.2.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.2.1/Dockerfile b/linux/atlassian/confluence/6/6.2.1/Dockerfile index a92c188e7..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.2.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.2.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.2.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.2.1/Makefile b/linux/atlassian/confluence/6/6.2.1/Makefile index 579cfc2a0..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.2.1/Makefile +++ b/linux/atlassian/confluence/6/6.2.1/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.2.1 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.2.1/docker-compose.yml b/linux/atlassian/confluence/6/6.2.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.2.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.2.2/.env b/linux/atlassian/confluence/6/6.2.2/.env new file mode 100644 index 000000000..284ae0cbf --- /dev/null +++ b/linux/atlassian/confluence/6/6.2.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.2.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.2.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.2.2/Dockerfile b/linux/atlassian/confluence/6/6.2.2/Dockerfile new file mode 100644 index 000000000..f3e6e40c1 --- /dev/null +++ b/linux/atlassian/confluence/6/6.2.2/Dockerfile @@ -0,0 +1,49 @@ +FROM epicmorg/prod:jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html +ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence +ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence + +VOLUME ["${CONFLUENCE_HOME}"] +WORKDIR $CONFLUENCE_HOME + +# Expose HTTP and Synchrony ports +EXPOSE 8090 +EXPOSE 8091 + +################################################################## +# Installing +################################################################## +RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ + && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \ + && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/linux/atlassian/confluence/6/6.2.2/Makefile b/linux/atlassian/confluence/6/6.2.2/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/atlassian/confluence/6/6.2.2/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.2.2/docker-compose.yml b/linux/atlassian/confluence/6/6.2.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.2.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.2.2/entrypoint.sh b/linux/atlassian/confluence/6/6.2.2/entrypoint.sh new file mode 100644 index 000000000..250fc031a --- /dev/null +++ b/linux/atlassian/confluence/6/6.2.2/entrypoint.sh @@ -0,0 +1,39 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export CATALINA_OPTS + + +# Start Confluence as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${CONFLUENCE_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${CONFLUENCE_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${CONFLUENCE_HOME}" + fi + # Now drop privileges + exec su -s /bin/bash "${RUN_USER}" -c "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh $@" +else + exec "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh" "$@" +fi diff --git a/linux/atlassian/confluence/6/6.2.3/.env b/linux/atlassian/confluence/6/6.2.3/.env new file mode 100644 index 000000000..87489b388 --- /dev/null +++ b/linux/atlassian/confluence/6/6.2.3/.env @@ -0,0 +1,3 @@ + +RELEASE=6.2.3 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.2.3.tar.gz diff --git a/linux/atlassian/confluence/6/6.2.3/Dockerfile b/linux/atlassian/confluence/6/6.2.3/Dockerfile index 6cb8e82b0..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.2.3/Dockerfile +++ b/linux/atlassian/confluence/6/6.2.3/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.2.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.2.3/Makefile b/linux/atlassian/confluence/6/6.2.3/Makefile index 4e065a590..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.2.3/Makefile +++ b/linux/atlassian/confluence/6/6.2.3/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.2.3 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.2.3/docker-compose.yml b/linux/atlassian/confluence/6/6.2.3/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.2.3/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.2.4/.env b/linux/atlassian/confluence/6/6.2.4/.env new file mode 100644 index 000000000..7344e72f1 --- /dev/null +++ b/linux/atlassian/confluence/6/6.2.4/.env @@ -0,0 +1,3 @@ + +RELEASE=6.2.4 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.2.4.tar.gz diff --git a/linux/atlassian/confluence/6/6.2.4/Dockerfile b/linux/atlassian/confluence/6/6.2.4/Dockerfile index 5a6774b8b..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.2.4/Dockerfile +++ b/linux/atlassian/confluence/6/6.2.4/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.2.4 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.2.4/Makefile b/linux/atlassian/confluence/6/6.2.4/Makefile index da230e169..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.2.4/Makefile +++ b/linux/atlassian/confluence/6/6.2.4/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.2.4 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.2.4/docker-compose.yml b/linux/atlassian/confluence/6/6.2.4/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.2.4/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.3.1/.env b/linux/atlassian/confluence/6/6.3.1/.env new file mode 100644 index 000000000..e45728e1e --- /dev/null +++ b/linux/atlassian/confluence/6/6.3.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.3.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.3.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.3.1/Dockerfile b/linux/atlassian/confluence/6/6.3.1/Dockerfile index 5427ff517..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.3.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.3.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.3.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.3.1/Makefile b/linux/atlassian/confluence/6/6.3.1/Makefile index 5a829cec6..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.3.1/Makefile +++ b/linux/atlassian/confluence/6/6.3.1/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.3.1 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.3.1/docker-compose.yml b/linux/atlassian/confluence/6/6.3.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.3.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.3.2/.env b/linux/atlassian/confluence/6/6.3.2/.env new file mode 100644 index 000000000..310edce37 --- /dev/null +++ b/linux/atlassian/confluence/6/6.3.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.3.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.3.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.3.2/Dockerfile b/linux/atlassian/confluence/6/6.3.2/Dockerfile index 966862883..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.3.2/Dockerfile +++ b/linux/atlassian/confluence/6/6.3.2/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.3.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.3.2/Makefile b/linux/atlassian/confluence/6/6.3.2/Makefile index 87cb02a13..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.3.2/Makefile +++ b/linux/atlassian/confluence/6/6.3.2/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.3.2 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.3.2/docker-compose.yml b/linux/atlassian/confluence/6/6.3.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.3.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.3.3/.env b/linux/atlassian/confluence/6/6.3.3/.env new file mode 100644 index 000000000..7df336f6e --- /dev/null +++ b/linux/atlassian/confluence/6/6.3.3/.env @@ -0,0 +1,3 @@ + +RELEASE=6.3.3 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.3.3.tar.gz diff --git a/linux/atlassian/confluence/6/6.3.3/Dockerfile b/linux/atlassian/confluence/6/6.3.3/Dockerfile index 0538b7412..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.3.3/Dockerfile +++ b/linux/atlassian/confluence/6/6.3.3/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.3.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.3.3/Makefile b/linux/atlassian/confluence/6/6.3.3/Makefile index 3fbdcf9e3..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.3.3/Makefile +++ b/linux/atlassian/confluence/6/6.3.3/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.3.3 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.3.3/docker-compose.yml b/linux/atlassian/confluence/6/6.3.3/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.3.3/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.3.4/.env b/linux/atlassian/confluence/6/6.3.4/.env new file mode 100644 index 000000000..e2f22e173 --- /dev/null +++ b/linux/atlassian/confluence/6/6.3.4/.env @@ -0,0 +1,3 @@ + +RELEASE=6.3.4 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.3.4.tar.gz diff --git a/linux/atlassian/confluence/6/6.3.4/Dockerfile b/linux/atlassian/confluence/6/6.3.4/Dockerfile index c5943a421..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.3.4/Dockerfile +++ b/linux/atlassian/confluence/6/6.3.4/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.3.4 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.3.4/Makefile b/linux/atlassian/confluence/6/6.3.4/Makefile index 1505da964..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.3.4/Makefile +++ b/linux/atlassian/confluence/6/6.3.4/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.3.4 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.3.4/docker-compose.yml b/linux/atlassian/confluence/6/6.3.4/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.3.4/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.4.0/.env b/linux/atlassian/confluence/6/6.4.0/.env new file mode 100644 index 000000000..edc7914d2 --- /dev/null +++ b/linux/atlassian/confluence/6/6.4.0/.env @@ -0,0 +1,3 @@ + +RELEASE=6.4.0 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.4.0.tar.gz diff --git a/linux/atlassian/confluence/6/6.4.0/Dockerfile b/linux/atlassian/confluence/6/6.4.0/Dockerfile index e54266583..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.4.0/Dockerfile +++ b/linux/atlassian/confluence/6/6.4.0/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.4.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.4.0/Makefile b/linux/atlassian/confluence/6/6.4.0/Makefile index dd3a24008..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.4.0/Makefile +++ b/linux/atlassian/confluence/6/6.4.0/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.4.0 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.4.0/docker-compose.yml b/linux/atlassian/confluence/6/6.4.0/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.4.0/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.4.1/.env b/linux/atlassian/confluence/6/6.4.1/.env new file mode 100644 index 000000000..0ffba2ad0 --- /dev/null +++ b/linux/atlassian/confluence/6/6.4.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.4.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.4.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.4.1/Dockerfile b/linux/atlassian/confluence/6/6.4.1/Dockerfile index 62c64bbde..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.4.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.4.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.4.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.4.1/Makefile b/linux/atlassian/confluence/6/6.4.1/Makefile index 7379fec29..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.4.1/Makefile +++ b/linux/atlassian/confluence/6/6.4.1/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.4.1 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.4.1/docker-compose.yml b/linux/atlassian/confluence/6/6.4.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.4.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.4.2/.env b/linux/atlassian/confluence/6/6.4.2/.env new file mode 100644 index 000000000..6aa43e67e --- /dev/null +++ b/linux/atlassian/confluence/6/6.4.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.4.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.4.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.4.2/Dockerfile b/linux/atlassian/confluence/6/6.4.2/Dockerfile index d092f4d19..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.4.2/Dockerfile +++ b/linux/atlassian/confluence/6/6.4.2/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.4.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.4.2/Makefile b/linux/atlassian/confluence/6/6.4.2/Makefile index 34484b6ce..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.4.2/Makefile +++ b/linux/atlassian/confluence/6/6.4.2/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.4.2 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.4.2/docker-compose.yml b/linux/atlassian/confluence/6/6.4.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.4.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.4.3/.env b/linux/atlassian/confluence/6/6.4.3/.env new file mode 100644 index 000000000..5712f9dfc --- /dev/null +++ b/linux/atlassian/confluence/6/6.4.3/.env @@ -0,0 +1,3 @@ + +RELEASE=6.4.3 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.4.3.tar.gz diff --git a/linux/atlassian/confluence/6/6.4.3/Dockerfile b/linux/atlassian/confluence/6/6.4.3/Dockerfile index 6281998aa..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.4.3/Dockerfile +++ b/linux/atlassian/confluence/6/6.4.3/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.4.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.4.3/Makefile b/linux/atlassian/confluence/6/6.4.3/Makefile index 888a64d97..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.4.3/Makefile +++ b/linux/atlassian/confluence/6/6.4.3/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.4.3 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.4.3/docker-compose.yml b/linux/atlassian/confluence/6/6.4.3/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.4.3/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.5.0/.env b/linux/atlassian/confluence/6/6.5.0/.env new file mode 100644 index 000000000..d30a1d3a9 --- /dev/null +++ b/linux/atlassian/confluence/6/6.5.0/.env @@ -0,0 +1,3 @@ + +RELEASE=6.5.0 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.5.0.tar.gz diff --git a/linux/atlassian/confluence/6/6.5.0/Dockerfile b/linux/atlassian/confluence/6/6.5.0/Dockerfile index e674e1e53..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.5.0/Dockerfile +++ b/linux/atlassian/confluence/6/6.5.0/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.5.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.5.0/Makefile b/linux/atlassian/confluence/6/6.5.0/Makefile index a457b27b6..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.5.0/Makefile +++ b/linux/atlassian/confluence/6/6.5.0/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.5.0 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.5.0/docker-compose.yml b/linux/atlassian/confluence/6/6.5.0/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.5.0/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.5.1/.env b/linux/atlassian/confluence/6/6.5.1/.env new file mode 100644 index 000000000..e12c4817e --- /dev/null +++ b/linux/atlassian/confluence/6/6.5.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.5.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.5.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.5.1/Dockerfile b/linux/atlassian/confluence/6/6.5.1/Dockerfile index fb30c69be..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.5.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.5.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.5.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.5.1/Makefile b/linux/atlassian/confluence/6/6.5.1/Makefile index 10590eca2..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.5.1/Makefile +++ b/linux/atlassian/confluence/6/6.5.1/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.5.1 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.5.1/docker-compose.yml b/linux/atlassian/confluence/6/6.5.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.5.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.5.2/.env b/linux/atlassian/confluence/6/6.5.2/.env new file mode 100644 index 000000000..b078db65b --- /dev/null +++ b/linux/atlassian/confluence/6/6.5.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.5.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.5.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.5.2/Dockerfile b/linux/atlassian/confluence/6/6.5.2/Dockerfile index 6a5f7cc0f..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.5.2/Dockerfile +++ b/linux/atlassian/confluence/6/6.5.2/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.5.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.5.2/Makefile b/linux/atlassian/confluence/6/6.5.2/Makefile index d9dde7a8f..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.5.2/Makefile +++ b/linux/atlassian/confluence/6/6.5.2/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.5.2 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.5.2/docker-compose.yml b/linux/atlassian/confluence/6/6.5.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.5.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.5.3/.env b/linux/atlassian/confluence/6/6.5.3/.env new file mode 100644 index 000000000..70fa0bfa7 --- /dev/null +++ b/linux/atlassian/confluence/6/6.5.3/.env @@ -0,0 +1,3 @@ + +RELEASE=6.5.3 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.5.3.tar.gz diff --git a/linux/atlassian/confluence/6/6.5.3/Dockerfile b/linux/atlassian/confluence/6/6.5.3/Dockerfile index f81e707cb..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.5.3/Dockerfile +++ b/linux/atlassian/confluence/6/6.5.3/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.5.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.5.3/Makefile b/linux/atlassian/confluence/6/6.5.3/Makefile index 1e1b17a1a..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.5.3/Makefile +++ b/linux/atlassian/confluence/6/6.5.3/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.5.3 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.5.3/docker-compose.yml b/linux/atlassian/confluence/6/6.5.3/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.5.3/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.0/.env b/linux/atlassian/confluence/6/6.6.0/.env new file mode 100644 index 000000000..45b8e64ff --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.0/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.0 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.0.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.0/Dockerfile b/linux/atlassian/confluence/6/6.6.0/Dockerfile index b0850304f..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.0/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.0/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.0/Makefile b/linux/atlassian/confluence/6/6.6.0/Makefile index 1876076f1..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.0/Makefile +++ b/linux/atlassian/confluence/6/6.6.0/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.0 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.0/docker-compose.yml b/linux/atlassian/confluence/6/6.6.0/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.0/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.1/.env b/linux/atlassian/confluence/6/6.6.1/.env new file mode 100644 index 000000000..d34c02445 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.1/Dockerfile b/linux/atlassian/confluence/6/6.6.1/Dockerfile index 1608677f8..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.1/Makefile b/linux/atlassian/confluence/6/6.6.1/Makefile index 9127a3ae2..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.1/Makefile +++ b/linux/atlassian/confluence/6/6.6.1/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.1 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.1/docker-compose.yml b/linux/atlassian/confluence/6/6.6.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.10/.env b/linux/atlassian/confluence/6/6.6.10/.env new file mode 100644 index 000000000..b361c9b20 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.10/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.10 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.10.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.10/Dockerfile b/linux/atlassian/confluence/6/6.6.10/Dockerfile index eb33e2439..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.10/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.10/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.10 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.10/Makefile b/linux/atlassian/confluence/6/6.6.10/Makefile index e322ce139..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.10/Makefile +++ b/linux/atlassian/confluence/6/6.6.10/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.10 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.10/docker-compose.yml b/linux/atlassian/confluence/6/6.6.10/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.10/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.11/.env b/linux/atlassian/confluence/6/6.6.11/.env new file mode 100644 index 000000000..b596676b1 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.11/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.11 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.11.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.11/Dockerfile b/linux/atlassian/confluence/6/6.6.11/Dockerfile index 65d9e9233..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.11/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.11/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.11 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.11/Makefile b/linux/atlassian/confluence/6/6.6.11/Makefile index 42ff0164d..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.11/Makefile +++ b/linux/atlassian/confluence/6/6.6.11/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.11 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.11/docker-compose.yml b/linux/atlassian/confluence/6/6.6.11/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.11/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.12/.env b/linux/atlassian/confluence/6/6.6.12/.env new file mode 100644 index 000000000..656c9641b --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.12/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.12 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.12.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.12/Dockerfile b/linux/atlassian/confluence/6/6.6.12/Dockerfile index 17da76ab4..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.12/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.12/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.12 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.12/Makefile b/linux/atlassian/confluence/6/6.6.12/Makefile index 29ec4ae8d..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.12/Makefile +++ b/linux/atlassian/confluence/6/6.6.12/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.12 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.12/docker-compose.yml b/linux/atlassian/confluence/6/6.6.12/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.12/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.13/.env b/linux/atlassian/confluence/6/6.6.13/.env new file mode 100644 index 000000000..88783b979 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.13/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.13 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.13.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.13/Dockerfile b/linux/atlassian/confluence/6/6.6.13/Dockerfile index cd6f7d0e5..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.13/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.13/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.13 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.13/Makefile b/linux/atlassian/confluence/6/6.6.13/Makefile index 4a5e342e0..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.13/Makefile +++ b/linux/atlassian/confluence/6/6.6.13/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.13 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.13/docker-compose.yml b/linux/atlassian/confluence/6/6.6.13/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.13/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.14/.env b/linux/atlassian/confluence/6/6.6.14/.env new file mode 100644 index 000000000..87766073b --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.14/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.14 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.14.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.14/Dockerfile b/linux/atlassian/confluence/6/6.6.14/Dockerfile index 88534111b..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.14/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.14/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.14 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.14/Makefile b/linux/atlassian/confluence/6/6.6.14/Makefile index c07283d88..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.14/Makefile +++ b/linux/atlassian/confluence/6/6.6.14/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.14 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.14/docker-compose.yml b/linux/atlassian/confluence/6/6.6.14/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.14/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.15/.env b/linux/atlassian/confluence/6/6.6.15/.env new file mode 100644 index 000000000..3e90b7e7e --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.15/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.15 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.15.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.15/Dockerfile b/linux/atlassian/confluence/6/6.6.15/Dockerfile index 65fd33268..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.15/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.15/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.15 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.15/Makefile b/linux/atlassian/confluence/6/6.6.15/Makefile index c16e574e6..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.15/Makefile +++ b/linux/atlassian/confluence/6/6.6.15/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.15 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.15/docker-compose.yml b/linux/atlassian/confluence/6/6.6.15/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.15/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.16/.env b/linux/atlassian/confluence/6/6.6.16/.env new file mode 100644 index 000000000..43cd635a8 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.16/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.16 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.16.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.16/Dockerfile b/linux/atlassian/confluence/6/6.6.16/Dockerfile new file mode 100644 index 000000000..f3e6e40c1 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.16/Dockerfile @@ -0,0 +1,49 @@ +FROM epicmorg/prod:jdk8 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html +ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence +ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence + +VOLUME ["${CONFLUENCE_HOME}"] +WORKDIR $CONFLUENCE_HOME + +# Expose HTTP and Synchrony ports +EXPOSE 8090 +EXPOSE 8091 + +################################################################## +# Installing +################################################################## +RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ + && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \ + && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/linux/atlassian/confluence/6/6.6.16/Makefile b/linux/atlassian/confluence/6/6.6.16/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.16/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.16/docker-compose.yml b/linux/atlassian/confluence/6/6.6.16/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.16/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.16/entrypoint.sh b/linux/atlassian/confluence/6/6.6.16/entrypoint.sh new file mode 100644 index 000000000..250fc031a --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.16/entrypoint.sh @@ -0,0 +1,39 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export CATALINA_OPTS + + +# Start Confluence as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${CONFLUENCE_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${CONFLUENCE_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${CONFLUENCE_HOME}" + fi + # Now drop privileges + exec su -s /bin/bash "${RUN_USER}" -c "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh $@" +else + exec "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh" "$@" +fi diff --git a/linux/atlassian/confluence/6/6.6.17/.env b/linux/atlassian/confluence/6/6.6.17/.env new file mode 100644 index 000000000..7e025377f --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.17/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.17 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.17.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.17/Dockerfile b/linux/atlassian/confluence/6/6.6.17/Dockerfile index 554b5841a..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.17/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.17/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.17 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.17/Makefile b/linux/atlassian/confluence/6/6.6.17/Makefile index 356dd5709..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.17/Makefile +++ b/linux/atlassian/confluence/6/6.6.17/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.17 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.17/docker-compose.yml b/linux/atlassian/confluence/6/6.6.17/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.17/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.2/.env b/linux/atlassian/confluence/6/6.6.2/.env new file mode 100644 index 000000000..d7e9f01a6 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.2/Dockerfile b/linux/atlassian/confluence/6/6.6.2/Dockerfile index e0bc6ea1b..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.2/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.2/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.2/Makefile b/linux/atlassian/confluence/6/6.6.2/Makefile index d66002167..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.2/Makefile +++ b/linux/atlassian/confluence/6/6.6.2/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.2 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.2/docker-compose.yml b/linux/atlassian/confluence/6/6.6.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.3/.env b/linux/atlassian/confluence/6/6.6.3/.env new file mode 100644 index 000000000..48a685e93 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.3/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.3 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.3.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.3/Dockerfile b/linux/atlassian/confluence/6/6.6.3/Dockerfile index a19bd9413..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.3/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.3/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.3/Makefile b/linux/atlassian/confluence/6/6.6.3/Makefile index ecb5e0dd8..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.3/Makefile +++ b/linux/atlassian/confluence/6/6.6.3/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.3 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.3/docker-compose.yml b/linux/atlassian/confluence/6/6.6.3/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.3/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.4/.env b/linux/atlassian/confluence/6/6.6.4/.env new file mode 100644 index 000000000..d4cc67ded --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.4/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.4 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.4.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.4/Dockerfile b/linux/atlassian/confluence/6/6.6.4/Dockerfile index 9c8864c32..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.4/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.4/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.4 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.4/Makefile b/linux/atlassian/confluence/6/6.6.4/Makefile index 47c8828ca..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.4/Makefile +++ b/linux/atlassian/confluence/6/6.6.4/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.4 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.4/docker-compose.yml b/linux/atlassian/confluence/6/6.6.4/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.4/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.5/.env b/linux/atlassian/confluence/6/6.6.5/.env new file mode 100644 index 000000000..7dbc98196 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.5/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.5 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.5.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.5/Dockerfile b/linux/atlassian/confluence/6/6.6.5/Dockerfile index eec344827..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.5/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.5/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.5 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.5/Makefile b/linux/atlassian/confluence/6/6.6.5/Makefile index 9bdd33e42..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.5/Makefile +++ b/linux/atlassian/confluence/6/6.6.5/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.5 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.5/docker-compose.yml b/linux/atlassian/confluence/6/6.6.5/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.5/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.6/.env b/linux/atlassian/confluence/6/6.6.6/.env new file mode 100644 index 000000000..d81c7e388 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.6/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.6 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.6.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.6/Dockerfile b/linux/atlassian/confluence/6/6.6.6/Dockerfile index cadb2a898..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.6/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.6/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.6 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.6/Makefile b/linux/atlassian/confluence/6/6.6.6/Makefile index 8c37edc2f..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.6/Makefile +++ b/linux/atlassian/confluence/6/6.6.6/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.6 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.6/docker-compose.yml b/linux/atlassian/confluence/6/6.6.6/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.6/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.7/.env b/linux/atlassian/confluence/6/6.6.7/.env new file mode 100644 index 000000000..a9226369e --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.7/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.7 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.7.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.7/Dockerfile b/linux/atlassian/confluence/6/6.6.7/Dockerfile index 2650f20ab..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.7/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.7/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.7 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.7/Makefile b/linux/atlassian/confluence/6/6.6.7/Makefile index d091db002..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.7/Makefile +++ b/linux/atlassian/confluence/6/6.6.7/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.7 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.7/docker-compose.yml b/linux/atlassian/confluence/6/6.6.7/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.7/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.8/.env b/linux/atlassian/confluence/6/6.6.8/.env new file mode 100644 index 000000000..baa84f762 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.8/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.8 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.8.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.8/Dockerfile b/linux/atlassian/confluence/6/6.6.8/Dockerfile index 408735cf7..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.8/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.8/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.8 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.8/Makefile b/linux/atlassian/confluence/6/6.6.8/Makefile index d3628320b..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.8/Makefile +++ b/linux/atlassian/confluence/6/6.6.8/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.8 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.8/docker-compose.yml b/linux/atlassian/confluence/6/6.6.8/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.8/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.6.9/.env b/linux/atlassian/confluence/6/6.6.9/.env new file mode 100644 index 000000000..ab8265e13 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.9/.env @@ -0,0 +1,3 @@ + +RELEASE=6.6.9 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.6.9.tar.gz diff --git a/linux/atlassian/confluence/6/6.6.9/Dockerfile b/linux/atlassian/confluence/6/6.6.9/Dockerfile index 5e3984215..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.6.9/Dockerfile +++ b/linux/atlassian/confluence/6/6.6.9/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.6.9 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.6.9/Makefile b/linux/atlassian/confluence/6/6.6.9/Makefile index 6206d1f00..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.6.9/Makefile +++ b/linux/atlassian/confluence/6/6.6.9/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.6.9 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.6.9/docker-compose.yml b/linux/atlassian/confluence/6/6.6.9/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.6.9/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.7.0/.env b/linux/atlassian/confluence/6/6.7.0/.env new file mode 100644 index 000000000..e9594d19f --- /dev/null +++ b/linux/atlassian/confluence/6/6.7.0/.env @@ -0,0 +1,3 @@ + +RELEASE=6.7.0 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.7.0.tar.gz diff --git a/linux/atlassian/confluence/6/6.7.0/Dockerfile b/linux/atlassian/confluence/6/6.7.0/Dockerfile index 9dc91e223..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.7.0/Dockerfile +++ b/linux/atlassian/confluence/6/6.7.0/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.7.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.7.0/Makefile b/linux/atlassian/confluence/6/6.7.0/Makefile index 23bfba3d1..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.7.0/Makefile +++ b/linux/atlassian/confluence/6/6.7.0/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.7.0 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.7.0/docker-compose.yml b/linux/atlassian/confluence/6/6.7.0/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.7.0/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.7.1/.env b/linux/atlassian/confluence/6/6.7.1/.env new file mode 100644 index 000000000..d390d39a1 --- /dev/null +++ b/linux/atlassian/confluence/6/6.7.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.7.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.7.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.7.1/Dockerfile b/linux/atlassian/confluence/6/6.7.1/Dockerfile index d868cca9e..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.7.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.7.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.7.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.7.1/Makefile b/linux/atlassian/confluence/6/6.7.1/Makefile index 0375c7354..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.7.1/Makefile +++ b/linux/atlassian/confluence/6/6.7.1/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.7.1 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.7.1/docker-compose.yml b/linux/atlassian/confluence/6/6.7.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.7.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.7.2/.env b/linux/atlassian/confluence/6/6.7.2/.env new file mode 100644 index 000000000..9bd3155a6 --- /dev/null +++ b/linux/atlassian/confluence/6/6.7.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.7.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.7.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.7.2/Dockerfile b/linux/atlassian/confluence/6/6.7.2/Dockerfile index bde658aa8..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.7.2/Dockerfile +++ b/linux/atlassian/confluence/6/6.7.2/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.7.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.7.2/Makefile b/linux/atlassian/confluence/6/6.7.2/Makefile index 4f78c9478..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.7.2/Makefile +++ b/linux/atlassian/confluence/6/6.7.2/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.7.2 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.7.2/docker-compose.yml b/linux/atlassian/confluence/6/6.7.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.7.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.7.3/.env b/linux/atlassian/confluence/6/6.7.3/.env new file mode 100644 index 000000000..64a3a4d6d --- /dev/null +++ b/linux/atlassian/confluence/6/6.7.3/.env @@ -0,0 +1,3 @@ + +RELEASE=6.7.3 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.7.3.tar.gz diff --git a/linux/atlassian/confluence/6/6.7.3/Dockerfile b/linux/atlassian/confluence/6/6.7.3/Dockerfile index cf138aaf8..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.7.3/Dockerfile +++ b/linux/atlassian/confluence/6/6.7.3/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.7.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.7.3/Makefile b/linux/atlassian/confluence/6/6.7.3/Makefile index f53fd1b3e..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.7.3/Makefile +++ b/linux/atlassian/confluence/6/6.7.3/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.7.3 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.7.3/docker-compose.yml b/linux/atlassian/confluence/6/6.7.3/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.7.3/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.8.0/.env b/linux/atlassian/confluence/6/6.8.0/.env new file mode 100644 index 000000000..bd0f07d7f --- /dev/null +++ b/linux/atlassian/confluence/6/6.8.0/.env @@ -0,0 +1,3 @@ + +RELEASE=6.8.0 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.8.0.tar.gz diff --git a/linux/atlassian/confluence/6/6.8.0/Dockerfile b/linux/atlassian/confluence/6/6.8.0/Dockerfile index 6b0568acc..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.8.0/Dockerfile +++ b/linux/atlassian/confluence/6/6.8.0/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.8.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.8.0/Makefile b/linux/atlassian/confluence/6/6.8.0/Makefile index 8914687ef..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.8.0/Makefile +++ b/linux/atlassian/confluence/6/6.8.0/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.8.0 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.8.0/docker-compose.yml b/linux/atlassian/confluence/6/6.8.0/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.8.0/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.8.1/.env b/linux/atlassian/confluence/6/6.8.1/.env new file mode 100644 index 000000000..eeca8131a --- /dev/null +++ b/linux/atlassian/confluence/6/6.8.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.8.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.8.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.8.1/Dockerfile b/linux/atlassian/confluence/6/6.8.1/Dockerfile index 9473a5c21..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.8.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.8.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.8.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.8.1/Makefile b/linux/atlassian/confluence/6/6.8.1/Makefile index 18152fd63..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.8.1/Makefile +++ b/linux/atlassian/confluence/6/6.8.1/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.8.1 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.8.1/docker-compose.yml b/linux/atlassian/confluence/6/6.8.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.8.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.8.2/.env b/linux/atlassian/confluence/6/6.8.2/.env new file mode 100644 index 000000000..c633752cd --- /dev/null +++ b/linux/atlassian/confluence/6/6.8.2/.env @@ -0,0 +1,3 @@ + +RELEASE=6.8.2 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.8.2.tar.gz diff --git a/linux/atlassian/confluence/6/6.8.2/Dockerfile b/linux/atlassian/confluence/6/6.8.2/Dockerfile index daa28275d..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.8.2/Dockerfile +++ b/linux/atlassian/confluence/6/6.8.2/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.8.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.8.2/Makefile b/linux/atlassian/confluence/6/6.8.2/Makefile index 644a64e9a..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.8.2/Makefile +++ b/linux/atlassian/confluence/6/6.8.2/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.8.2 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.8.2/docker-compose.yml b/linux/atlassian/confluence/6/6.8.2/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.8.2/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.8.3/.env b/linux/atlassian/confluence/6/6.8.3/.env new file mode 100644 index 000000000..04b0382a6 --- /dev/null +++ b/linux/atlassian/confluence/6/6.8.3/.env @@ -0,0 +1,3 @@ + +RELEASE=6.8.3 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.8.3.tar.gz diff --git a/linux/atlassian/confluence/6/6.8.3/Dockerfile b/linux/atlassian/confluence/6/6.8.3/Dockerfile index 23aa96760..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.8.3/Dockerfile +++ b/linux/atlassian/confluence/6/6.8.3/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.8.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.8.3/Makefile b/linux/atlassian/confluence/6/6.8.3/Makefile index fc299aceb..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.8.3/Makefile +++ b/linux/atlassian/confluence/6/6.8.3/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.8.3 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.8.3/docker-compose.yml b/linux/atlassian/confluence/6/6.8.3/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.8.3/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.8.5/.env b/linux/atlassian/confluence/6/6.8.5/.env new file mode 100644 index 000000000..e7116fec2 --- /dev/null +++ b/linux/atlassian/confluence/6/6.8.5/.env @@ -0,0 +1,3 @@ + +RELEASE=6.8.5 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.8.5.tar.gz diff --git a/linux/atlassian/confluence/6/6.8.5/Dockerfile b/linux/atlassian/confluence/6/6.8.5/Dockerfile index 5d4878265..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.8.5/Dockerfile +++ b/linux/atlassian/confluence/6/6.8.5/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.8.5 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.8.5/Makefile b/linux/atlassian/confluence/6/6.8.5/Makefile index 45a3c676a..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.8.5/Makefile +++ b/linux/atlassian/confluence/6/6.8.5/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.8.5 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.8.5/docker-compose.yml b/linux/atlassian/confluence/6/6.8.5/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.8.5/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.9.0/.env b/linux/atlassian/confluence/6/6.9.0/.env new file mode 100644 index 000000000..2894cde94 --- /dev/null +++ b/linux/atlassian/confluence/6/6.9.0/.env @@ -0,0 +1,3 @@ + +RELEASE=6.9.0 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.9.0.tar.gz diff --git a/linux/atlassian/confluence/6/6.9.0/Dockerfile b/linux/atlassian/confluence/6/6.9.0/Dockerfile index e31383c10..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.9.0/Dockerfile +++ b/linux/atlassian/confluence/6/6.9.0/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.9.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.9.0/Makefile b/linux/atlassian/confluence/6/6.9.0/Makefile index 8e9d5875b..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.9.0/Makefile +++ b/linux/atlassian/confluence/6/6.9.0/Makefile @@ -1,5 +1,5 @@ -all: confl - -confl: - docker build --compress -t epicmorg/confluence:6.9.0 . +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.9.0/docker-compose.yml b/linux/atlassian/confluence/6/6.9.0/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.9.0/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.9.1/.env b/linux/atlassian/confluence/6/6.9.1/.env new file mode 100644 index 000000000..21643280f --- /dev/null +++ b/linux/atlassian/confluence/6/6.9.1/.env @@ -0,0 +1,3 @@ + +RELEASE=6.9.1 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.9.1.tar.gz diff --git a/linux/atlassian/confluence/6/6.9.1/Dockerfile b/linux/atlassian/confluence/6/6.9.1/Dockerfile index f5b01ef4a..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.9.1/Dockerfile +++ b/linux/atlassian/confluence/6/6.9.1/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.9.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.9.1/Makefile b/linux/atlassian/confluence/6/6.9.1/Makefile index e10d5aa7c..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.9.1/Makefile +++ b/linux/atlassian/confluence/6/6.9.1/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.9.1 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.9.1/docker-compose.yml b/linux/atlassian/confluence/6/6.9.1/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.9.1/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file diff --git a/linux/atlassian/confluence/6/6.9.3/.env b/linux/atlassian/confluence/6/6.9.3/.env new file mode 100644 index 000000000..41c6ceb1b --- /dev/null +++ b/linux/atlassian/confluence/6/6.9.3/.env @@ -0,0 +1,3 @@ + +RELEASE=6.9.3 +DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-6.9.3.tar.gz diff --git a/linux/atlassian/confluence/6/6.9.3/Dockerfile b/linux/atlassian/confluence/6/6.9.3/Dockerfile index e5540d33d..f3e6e40c1 100644 --- a/linux/atlassian/confluence/6/6.9.3/Dockerfile +++ b/linux/atlassian/confluence/6/6.9.3/Dockerfile @@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=6.9.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +#configured by dockerfile / .ENV +ARG RELEASE +ARG DOWNLOAD_URL + ################################################################## # Setup diff --git a/linux/atlassian/confluence/6/6.9.3/Makefile b/linux/atlassian/confluence/6/6.9.3/Makefile index 24cf8034f..82c5a2de6 100644 --- a/linux/atlassian/confluence/6/6.9.3/Makefile +++ b/linux/atlassian/confluence/6/6.9.3/Makefile @@ -1,4 +1,5 @@ -all: confl +all: app -confl: - docker build --compress -t epicmorg/confluence:6.9.3 . +app: + docker-compose build --compress + docker-compose push diff --git a/linux/atlassian/confluence/6/6.9.3/docker-compose.yml b/linux/atlassian/confluence/6/6.9.3/docker-compose.yml new file mode 100644 index 000000000..3e8eba866 --- /dev/null +++ b/linux/atlassian/confluence/6/6.9.3/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.9' +services: + app: + image: "epicmorg/confluence:${RELEASE}" + build: + context: . + args: + RELEASE: ${RELEASE} + DOWNLOAD_URL: ${DOWNLOAD_URL} \ No newline at end of file