From 24b97b6ae55537b53e1468175dc3026d3a1b74b3 Mon Sep 17 00:00:00 2001 From: Thijs Lemmens Date: Thu, 4 Mar 2021 16:59:32 +0100 Subject: [PATCH 01/11] Update to WALG v0.2.19, fixes #36 --- CHANGELOG.md | 1 + build.gradle | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 999a3be..c44707b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 2021-03 +* [2021-03-04] [#36](https://github.com/xenit-eu/docker-postgres/issues/36) Update [WAL-G to v0.2.19](https://github.com/wal-g/wal-g/releases/tag/v0.2.19) * [2021-03-04] [#34](https://github.com/xenit-eu/docker-postgres/issues/34) Update to [PostgreSQL 2021-02-11 release](https://www.postgresql.org/about/news/postgresql-132-126-1111-1016-9621-and-9525-released-2165/) ## 2020-11 diff --git a/build.gradle b/build.gradle index 7bb79c6..e77d461 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ subprojects { project.ext { pgVersion = project.projectDir.name - walgVersion = 'v0.2.15' + walgVersion = 'v0.2.19' } apply plugin: 'eu.xenit.docker' @@ -62,8 +62,8 @@ subprojects { } dependencies { - testImplementation group: 'junit', name: 'junit', version: '4.13.1' - testImplementation group: 'org.postgresql', name: 'postgresql', version: '42.2.18' + testImplementation group: 'junit', name: 'junit', version: '4.13.2' + testImplementation group: 'org.postgresql', name: 'postgresql', version: '42.2.19' } sourceCompatibility = JavaVersion.VERSION_1_8 From 758035c1119a184b10e3445bb22012566b98e4d0 Mon Sep 17 00:00:00 2001 From: thijslemmens Date: Thu, 4 Mar 2021 20:25:11 +0100 Subject: [PATCH 02/11] Create ci.yml --- .github/workflows/ci.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..8e62198 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,29 @@ +# This workflow will build a Java project with Gradle +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle + +name: CI + +on: + push: + pull_request: + schedule: + - cron: '5 5 * * 1' + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Test with Gradle + run: ./gradlew check -i + - name: Publish docker images + if: github.ref == 'refs/heads/release' + run: ./gradlew pushDockerImage -i From cc4b314327c0a7324600b3028e0406fea8d11cd6 Mon Sep 17 00:00:00 2001 From: thijslemmens Date: Thu, 4 Mar 2021 20:33:05 +0100 Subject: [PATCH 03/11] added docker secrets --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e62198..425da7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,4 +26,7 @@ jobs: run: ./gradlew check -i - name: Publish docker images if: github.ref == 'refs/heads/release' + env: + DOCKER_USER: ${{ secrets.DOCKER_USER }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} run: ./gradlew pushDockerImage -i From feb97cffe98d550122111ad2183eee2c6968f5b6 Mon Sep 17 00:00:00 2001 From: Thijs Lemmens Date: Fri, 5 Mar 2021 11:53:07 +0100 Subject: [PATCH 04/11] Remove travis config --- .travis.yml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 67befe1..0000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -services: - - docker -language: java - -jobs: - include: - - stage: test - script: ./gradlew check -i - - stage: Push docker images - if: branch = release && type != pull_request - script: ./gradlew pushDockerImage -i - -cache: - directories: - - "$HOME/.gradle" \ No newline at end of file From b55bf1353db4dbbcf8b15b9b9064409e4ad129fc Mon Sep 17 00:00:00 2001 From: Hannes Van Camp Date: Thu, 1 Jul 2021 13:30:42 +0200 Subject: [PATCH 05/11] [DOCKER-386] removed maintainer instruction (deprecated) --- src/main/docker/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index ac10da1..a0ed516 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -1,8 +1,6 @@ ARG BASEIMAGE - FROM $BASEIMAGE -MAINTAINER thijs.lemmens@xenit.eu ARG PGVERSION ARG WALGVERSION From 177aba30e6a2531c3d0e06e42c9c46f84a2733af Mon Sep 17 00:00:00 2001 From: Hannes Van Camp Date: Thu, 1 Jul 2021 13:35:34 +0200 Subject: [PATCH 06/11] [DOCKER-386] updated gradle wrapper --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..69a9715 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 2ad9b0c36aedfc537860418e7460270ad74ed426 Mon Sep 17 00:00:00 2001 From: Hannes Van Camp Date: Thu, 1 Jul 2021 13:39:37 +0200 Subject: [PATCH 07/11] [DOCKER-386] updated docker gradle plugin --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e77d461..efbf75d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "eu.xenit.docker" version "5.2.0" apply false // Have a look at the releases to find the latest one + id "eu.xenit.docker" version "5.3.0" apply false // Have a look at the releases to find the latest one } project(':9.5') { From 30ae2597d7a254ba52f4d765fb00346c82cd329a Mon Sep 17 00:00:00 2001 From: Hannes Van Camp Date: Thu, 1 Jul 2021 13:42:43 +0200 Subject: [PATCH 08/11] [DOCKER-386] updated to postgresql 2021-05-13 releases --- build.gradle | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index efbf75d..e5e240c 100644 --- a/build.gradle +++ b/build.gradle @@ -11,36 +11,36 @@ project(':9.5') { project(':9.6') { project.ext { - baseImage = 'postgres:9.6.21' - tags = ['9', '9.6', '9.6.21'] + baseImage = 'postgres:9.6.22' + tags = ['9', '9.6', '9.6.22'] } } project(':10') { project.ext { - baseImage = 'postgres:10.16' - tags = ['10', '10.16'] + baseImage = 'postgres:10.17' + tags = ['10', '10.17'] } } project(':11') { project.ext { - baseImage = 'postgres:11.11' - tags = ['11', '11.11'] + baseImage = 'postgres:11.12' + tags = ['11', '11.12'] } } project(':12') { project.ext { - baseImage = 'postgres:12.6' - tags = ['12', '12.6'] + baseImage = 'postgres:12.7' + tags = ['12', '12.7'] } } project(':13') { project.ext { - baseImage = 'postgres:13.2' - tags = ['13', '13.2', 'latest'] + baseImage = 'postgres:13.3' + tags = ['13', '13.3', 'latest'] } } From 89d25fd5e59807d3b4e5630111a87f9e595cc7b1 Mon Sep 17 00:00:00 2001 From: Thijs Lemmens Date: Thu, 1 Jul 2021 16:11:51 +0200 Subject: [PATCH 09/11] bump github actions From 5899b0a0669e6aee9bcc0d4f5e443bd11c737f84 Mon Sep 17 00:00:00 2001 From: Wim Fabri Date: Thu, 2 Sep 2021 17:31:01 +0200 Subject: [PATCH 10/11] [XENOPS-882] - update to postgresql releases of 2021-08-12 --- build.gradle | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index e5e240c..d18c218 100644 --- a/build.gradle +++ b/build.gradle @@ -11,36 +11,36 @@ project(':9.5') { project(':9.6') { project.ext { - baseImage = 'postgres:9.6.22' - tags = ['9', '9.6', '9.6.22'] + baseImage = 'postgres:9.6.23' + tags = ['9', '9.6', '9.6.23'] } } project(':10') { project.ext { - baseImage = 'postgres:10.17' - tags = ['10', '10.17'] + baseImage = 'postgres:10.18' + tags = ['10', '10.18'] } } project(':11') { project.ext { - baseImage = 'postgres:11.12' - tags = ['11', '11.12'] + baseImage = 'postgres:11.13' + tags = ['11', '11.13'] } } project(':12') { project.ext { - baseImage = 'postgres:12.7' - tags = ['12', '12.7'] + baseImage = 'postgres:12.8' + tags = ['12', '12.8'] } } project(':13') { project.ext { - baseImage = 'postgres:13.3' - tags = ['13', '13.3', 'latest'] + baseImage = 'postgres:13.4' + tags = ['13', '13.4', 'latest'] } } @@ -107,4 +107,4 @@ subprojects { dockerCompose.isRequiredBy(test) -} \ No newline at end of file +} From c67316a62175121bd9bd70981ba925329cc75f2e Mon Sep 17 00:00:00 2001 From: Wim Fabri Date: Fri, 5 Nov 2021 19:32:19 +0100 Subject: [PATCH 11/11] XENOPS-940 - add option to manually trigger build --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 425da7d..8766f53 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,7 @@ on: pull_request: schedule: - cron: '5 5 * * 1' + workflow_dispatch: jobs: build: