Compare commits

...

51 Commits

Author SHA1 Message Date
alfresco-build
3872f059bb [maven-release-plugin][skip ci] prepare release 7.4.0 2023-05-04 16:26:23 +00:00
alfresco-build
d1d39af68a [release][publish] 7.4.0
Update upstream versions
    - alfresco-community-repo:   20.161
    - alfresco-enterprise-share: 20.163
    - acs-packaging:             7.4.0
    - RELEASE_VERSION:           7.4.0
    - DEVELOPMENT_VERSION:       7.4.1-A1-SNAPSHOT
2023-05-04 15:03:56 +00:00
alfresco-build
abbefa322e [maven-release-plugin][skip ci] prepare for next development iteration 2023-04-30 03:00:50 +00:00
alfresco-build
807fb8f14f [maven-release-plugin][skip ci] prepare release 7.4.0-A35 2023-04-30 03:00:48 +00:00
alfresco-build
e4f1dcd242 [release] 7.4.0-A35
Update upstream versions
    - alfresco-community-repo:   20.159
    - alfresco-enterprise-share: 20.158
    - acs-packaging:             7.4.0-A35
    - RELEASE_VERSION:           7.4.0-A35
    - DEVELOPMENT_VERSION:       7.4.0-A36-SNAPSHOT
2023-04-30 01:35:37 +00:00
alfresco-build
1e61d27d6c [maven-release-plugin][skip ci] prepare for next development iteration 2023-04-27 10:43:16 +00:00
alfresco-build
ec3112ab6d [maven-release-plugin][skip ci] prepare release 7.4.0-A34 2023-04-27 10:43:14 +00:00
alfresco-build
6b93b9a822 [release] 7.4.0-A34
Update upstream versions
    - alfresco-community-repo:   20.157
    - alfresco-enterprise-share: 20.156
    - acs-packaging:             7.4.0-A34
    - RELEASE_VERSION:           7.4.0-A34
    - DEVELOPMENT_VERSION:       7.4.0-A35-SNAPSHOT
2023-04-27 09:19:36 +00:00
alfresco-build
a2c66417b4 [maven-release-plugin][skip ci] prepare for next development iteration 2023-04-24 10:54:10 +00:00
alfresco-build
d9b1060dd0 [maven-release-plugin][skip ci] prepare release 7.4.0-A33 2023-04-24 10:54:08 +00:00
alfresco-build
78b5de7006 [release] 7.4.0-A33
Update upstream versions
    - alfresco-community-repo:   20.156
    - alfresco-enterprise-share: 20.155
    - acs-packaging:             7.4.0-A33
    - RELEASE_VERSION:           7.4.0-A33
    - DEVELOPMENT_VERSION:       7.4.0-A34-SNAPSHOT
2023-04-24 09:35:15 +00:00
alfresco-build
e72389f087 [maven-release-plugin][skip ci] prepare for next development iteration 2023-04-23 02:52:40 +00:00
alfresco-build
164a5b6e71 [maven-release-plugin][skip ci] prepare release 7.4.0-A32 2023-04-23 02:52:38 +00:00
alfresco-build
6e493f6fc2 [release] 7.4.0-A32
Update upstream versions
    - alfresco-community-repo:   20.156
    - alfresco-enterprise-share: 20.154
    - acs-packaging:             7.4.0-A32
    - RELEASE_VERSION:           7.4.0-A32
    - DEVELOPMENT_VERSION:       7.4.0-A33-SNAPSHOT
2023-04-23 01:34:36 +00:00
alfresco-build
ef0887366b [release] 7.4.0-A31
Update upstream versions
    - alfresco-community-repo:   20.155
    - alfresco-enterprise-share: 20.153
    - acs-packaging:             7.4.0-A31
    - RELEASE_VERSION:           7.4.0-A31
    - DEVELOPMENT_VERSION:       7.4.0-A32-SNAPSHOT
2023-04-21 21:19:22 +00:00
Tom Page
950d064617 ACS-5068 Upgrade to SS 2.0.7-A5. (#1514) 2023-04-20 11:21:32 +01:00
alfresco-build
e2bfebd0ba [release] 7.4.0-A29
Update upstream versions
    - alfresco-community-repo:   20.145
    - alfresco-enterprise-share: 20.141
    - acs-packaging:             7.4.0-A29
    - RELEASE_VERSION:           7.4.0-A29
    - DEVELOPMENT_VERSION:       7.4.0-A30-SNAPSHOT
2023-04-16 01:33:04 +00:00
alfresco-build
0b42ed0a8b [maven-release-plugin][skip ci] prepare for next development iteration 2023-04-09 03:04:31 +00:00
alfresco-build
7c7189182e [maven-release-plugin][skip ci] prepare release 7.4.0-A28 2023-04-09 03:04:30 +00:00
alfresco-build
0b2ddbb7a0 [release] 7.4.0-A28
Update upstream versions
    - alfresco-community-repo:   20.139
    - alfresco-enterprise-share: 20.134
    - acs-packaging:             7.4.0-A28
    - RELEASE_VERSION:           7.4.0-A28
    - DEVELOPMENT_VERSION:       7.4.0-A29-SNAPSHOT
2023-04-09 01:46:36 +00:00
alfresco-build
c864faa9b3 [maven-release-plugin][skip ci] prepare for next development iteration 2023-04-02 03:09:26 +00:00
alfresco-build
e2479176c2 [maven-release-plugin][skip ci] prepare release 7.4.0-A27 2023-04-02 03:09:24 +00:00
alfresco-build
2f69f23092 [release] 7.4.0-A27
Update upstream versions
    - alfresco-community-repo:   20.128
    - alfresco-enterprise-share: 20.121
    - acs-packaging:             7.4.0-A27
    - RELEASE_VERSION:           7.4.0-A27
    - DEVELOPMENT_VERSION:       7.4.0-A28-SNAPSHOT
2023-04-02 01:57:02 +00:00
alfresco-build
31577fba21 [maven-release-plugin][skip ci] prepare for next development iteration 2023-03-30 11:33:53 +00:00
alfresco-build
d117b56a42 [maven-release-plugin][skip ci] prepare release 7.4.0-A26 2023-03-30 11:33:50 +00:00
alfresco-build
9145d1924f [release] 7.4.0-A26
Update upstream versions
    - alfresco-community-repo:   20.124
    - alfresco-enterprise-share: 20.117
    - acs-packaging:             7.4.0-A26
    - RELEASE_VERSION:           7.4.0-A26
    - DEVELOPMENT_VERSION:       7.4.0-A27-SNAPSHOT
2023-03-30 10:06:18 +00:00
alfresco-build
9949eb6ebf [maven-release-plugin][skip ci] prepare for next development iteration 2023-03-29 11:11:04 +00:00
alfresco-build
4cbed75399 [maven-release-plugin][skip ci] prepare release 7.4.0-A25 2023-03-29 11:11:02 +00:00
alfresco-build
85b7cf4cd5 [release] 7.4.0-A25
Update upstream versions
    - alfresco-community-repo:   20.121
    - alfresco-enterprise-share: 20.112
    - acs-packaging:             7.4.0-A25
    - RELEASE_VERSION:           7.4.0-A25
    - DEVELOPMENT_VERSION:       7.4.0-A26-SNAPSHOT
2023-03-29 09:53:52 +00:00
alfresco-build
38a779b421 [maven-release-plugin][skip ci] prepare for next development iteration 2023-03-26 02:49:32 +00:00
alfresco-build
4e3178cabd [maven-release-plugin][skip ci] prepare release 7.4.0-A24 2023-03-26 02:49:30 +00:00
alfresco-build
e95814acf3 [release] 7.4.0-A24
Update upstream versions
    - alfresco-community-repo:   20.118
    - alfresco-enterprise-share: 20.108
    - acs-packaging:             7.4.0-A24
    - RELEASE_VERSION:           7.4.0-A24
    - DEVELOPMENT_VERSION:       7.4.0-A25-SNAPSHOT
2023-03-26 01:31:05 +00:00
alfresco-build
ccfafef37b [release] 7.4.0-A23
Update upstream versions
    - alfresco-community-repo:   20.115
    - alfresco-enterprise-share: 20.107
    - acs-packaging:             7.4.0-A23
    - RELEASE_VERSION:           7.4.0-A23
    - DEVELOPMENT_VERSION:       7.4.0-A24-SNAPSHOT
2023-03-24 08:55:02 +00:00
Damian Ujma
cd82e74b6d ACS-4900 Fix publish job (#1511) 2023-03-22 14:40:55 +01:00
alfresco-build
bc65bb6cf7 [maven-release-plugin][skip ci] prepare for next development iteration 2023-03-19 03:07:22 +00:00
alfresco-build
fb10cf9f8e [maven-release-plugin][skip ci] prepare release 7.4.0-A22 2023-03-19 03:07:20 +00:00
alfresco-build
345b7f9732 [release] 7.4.0-A22
Update upstream versions
    - alfresco-community-repo:   20.107
    - alfresco-enterprise-share: 20.98
    - acs-packaging:             7.4.0-A22
    - RELEASE_VERSION:           7.4.0-A22
    - DEVELOPMENT_VERSION:       7.4.0-A23-SNAPSHOT
2023-03-19 01:48:12 +00:00
alfresco-build
282d4ecedb [maven-release-plugin][skip ci] prepare for next development iteration 2023-03-16 14:27:51 +00:00
alfresco-build
31b6f612f4 [maven-release-plugin][skip ci] prepare release 7.4.0-A21 2023-03-16 14:27:49 +00:00
alfresco-build
8133c20355 [release] 7.4.0-A21
Update upstream versions
    - alfresco-community-repo:   20.105
    - alfresco-enterprise-share: 20.95
    - acs-packaging:             7.4.0-A21
    - RELEASE_VERSION:           7.4.0-A21
    - DEVELOPMENT_VERSION:       7.4.0-A22-SNAPSHOT
2023-03-16 13:10:36 +00:00
alfresco-build
8b41b66675 [maven-release-plugin][skip ci] prepare for next development iteration 2023-03-14 23:25:17 +00:00
alfresco-build
61cf3139ec [maven-release-plugin][skip ci] prepare release 7.4.0-A20 2023-03-14 23:25:15 +00:00
alfresco-build
31879f80e0 [release] 7.4.0-A20
Update upstream versions
    - alfresco-community-repo:   20.101
    - alfresco-enterprise-share: 20.92
    - acs-packaging:             7.4.0-A20
    - RELEASE_VERSION:           7.4.0-A20
    - DEVELOPMENT_VERSION:       7.4.0-A21-SNAPSHOT
2023-03-14 22:28:51 +00:00
Wojtek Świętoń
c3286dbcbf ACS-4140 Produce Multi-Arch Docker images (#1508)
* ACS-4140 Changes in pom and Dockerfile for alfresco-content-repository-community image

* ACS-4140 Changes in pom and Dockerfile for alfresco-governance-share-community and alfresco-governance-repository-community

* ACS-4140 Add docker image build mode option in build.sh

* ACS-4140 Fix in prepare_buildx.sh to not duplicate image.tag

* ACS-4139 Fix intermittent failures

* ACS-4139 Remove echo

* ACS-4140 Refactor build.sh

* ACS-4140 Added missing <BASE_IMAGE> argument

* ACS-4140 Push docker images to local repository

* ACS-4140 Add 'build-multiarch-docker-images' profile to 'share-community-docker'

* ACS-4140 Use build for 'push-docker-images' and 'release' profiles

* ACS-4140 Remove comments

* ACS-4140 Add missing properties

* ACS-4140 Inherit required properties

* ACS-4140 Change the 'build-multiarch-docker-image' profile phase to package

* Revert "ACS-4140 Change the 'build-multiarch-docker-image' profile phase to package"

This reverts commit 38781abc9a.

* ACS-4140 Bump community repo/share versions

---------

Co-authored-by: Damian.Ujma@hyland.com <Damian.Ujma@hyland.com>
2023-03-14 16:33:26 +01:00
alfresco-build
7559575daf [maven-release-plugin][skip ci] prepare for next development iteration 2023-03-12 01:42:31 +00:00
alfresco-build
ccf040d55a [maven-release-plugin][skip ci] prepare release 7.4.0-A19 2023-03-12 01:42:28 +00:00
alfresco-build
d532dd2448 [release] 7.4.0-A19
Update upstream versions
    - alfresco-community-repo:   20.97
    - alfresco-enterprise-share: 20.87
    - acs-packaging:             7.4.0-A19
    - RELEASE_VERSION:           7.4.0-A19
    - DEVELOPMENT_VERSION:       7.4.0-A20-SNAPSHOT
2023-03-12 01:01:17 +00:00
alfresco-build
ed31cfc681 [maven-release-plugin][skip ci] prepare for next development iteration 2023-03-07 08:58:27 +00:00
alfresco-build
cf2aee3bb8 [maven-release-plugin][skip ci] prepare release 7.4.0-M3 2023-03-07 08:58:24 +00:00
alfresco-build
105e605060 [release] 7.4.0-M3
Update upstream versions
    - alfresco-community-repo:   20.90
    - alfresco-enterprise-share: 20.84
    - acs-packaging:             7.4.0-M3
    - RELEASE_VERSION:           7.4.0-M3
    - DEVELOPMENT_VERSION:       7.4.0-A19-SNAPSHOT
2023-03-07 08:19:44 +00:00
alfresco-build
d4f0de607f [maven-release-plugin][skip ci] prepare for next development iteration 2023-03-05 01:49:20 +00:00
29 changed files with 416 additions and 48 deletions

View File

@@ -29,8 +29,8 @@ env:
TAS_ENVIRONMENT: ./tests/environment
TAS_SCRIPTS: ../alfresco-community-repo/packaging/tests/scripts
# Release version has to start with real version (7.4.0-....) for the docker image to build successfully.
RELEASE_VERSION: 7.4.0-A18
DEVELOPMENT_VERSION: 7.4.0-A19-SNAPSHOT
RELEASE_VERSION: 7.4.0
DEVELOPMENT_VERSION: 7.4.1-A1-SNAPSHOT
jobs:
tas_tests:
@@ -125,15 +125,22 @@ jobs:
!contains(github.event.head_commit.message, '[skip docker_latest]') &&
(github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
github.event_name != 'pull_request'
services:
registry:
image: registry:2
ports:
- 5000:5000
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
bash ./scripts/ci/init.sh
bash ./scripts/ci/build.sh
bash ./scripts/ci/build.sh -m
- name: "Push Docker images"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: mvn -B -ntp -V clean install -DskipTests -Dmaven.javadoc.skip=true -Pags -Ppush-docker-images
@@ -149,17 +156,24 @@ jobs:
contains(github.event.head_commit.message, '[release]') &&
(github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
github.event_name != 'pull_request'
services:
registry:
image: registry:2
ports:
- 5000:5000
steps:
- uses: actions/checkout@v3
with:
persist-credentials: false
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
bash ./scripts/ci/init.sh
bash ./scripts/ci/build.sh
bash ./scripts/ci/build.sh -m
- name: "Release"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<build>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<build>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<properties>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<dependencies>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<dependencies>

View File

@@ -1,4 +1,5 @@
FROM alfresco/alfresco-community-repo-base:${repo.image.tag}
ARG BASE_IMAGE
FROM ${BASE_IMAGE}
# Set default docker_context.
ARG resource_path=target

View File

@@ -1,3 +1,4 @@
ARG BASE_IMAGE
# BUILD STAGE AGS
FROM debian:11-slim AS AGSBUILDER
@@ -12,7 +13,7 @@ RUN unzip -q /build/gs-api-explorer-*.war -d /build/gs-api-explorer && \
chmod -R g-w,o= /build
# ACTUAL IMAGE
FROM alfresco/alfresco-content-repository-community:${image.tag}
FROM ${BASE_IMAGE}
# Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
# The access will be fixed after all operations are done.

View File

@@ -8,11 +8,13 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<properties>
<image.name>alfresco/alfresco-governance-repository-community</image.name>
<base.image>alfresco/alfresco-content-repository-community:${image.tag}</base.image>
<scripts.directory>${project.parent.parent.basedir}/scripts/dev</scripts.directory>
</properties>
<build>

View File

@@ -7,12 +7,14 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<properties>
<image.name>alfresco/alfresco-content-repository-community</image.name>
<docker.quay-expires.value>NEVER</docker.quay-expires.value>
<base.image>alfresco/alfresco-community-repo-base:${repo.image.tag}</base.image>
<scripts.directory>${project.parent.basedir}/scripts/dev</scripts.directory>
</properties>
<build>
@@ -76,6 +78,12 @@
<images>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<args>
<BASE_IMAGE>${base.image}</BASE_IMAGE>
</args>
<contextDir>${project.basedir}</contextDir>
</build>
</image>
</images>
</configuration>
@@ -93,6 +101,70 @@
</build>
</profile>
<profile>
<id>build-multiarch-docker-images</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<images>
<image>
<name>${local.registry}/${image.name}:${image.tag}</name>
<build>
<buildx>
<builderName>${builder.name}</builderName>
<platforms>
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
<BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
</args>
</build>
</image>
</images>
</configuration>
<executions>
<execution>
<id>build-push-image</id>
<phase>install</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<executions>
<execution>
<id>prepare-buildx</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${scripts.directory}/prepare_buildx.sh</executable>
<arguments>
<argument>${builder.name}</argument>
<argument>${image.registry}</argument>
<argument>${image.name}</argument>
<argument>${image.tag}</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>push-docker-images</id>
<!-- publishes "image:latest" to Quay -->
@@ -105,8 +177,20 @@
<images>
<!-- Quay image -->
<image>
<name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry>
<name>${image.registry}/${image.name}:${image.tag}</name>
<build>
<buildx>
<builderName>${builder.name}</builderName>
<platforms>
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
<BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
</args>
</build>
</image>
</images>
</configuration>
@@ -121,6 +205,28 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<executions>
<execution>
<id>prepare-buildx</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${scripts.directory}/prepare_buildx.sh</executable>
<arguments>
<argument>${builder.name}</argument>
<argument>${image.registry}</argument>
<argument>${image.name}</argument>
<argument>${image.tag}</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
@@ -142,6 +248,19 @@
<!-- DockerHub image -->
<image>
<name>${image.name}:${project.version}</name>
<build>
<buildx>
<builderName>${builder.name}</builderName>
<platforms>
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
<BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
</args>
</build>
</image>
</images>
</configuration>
@@ -157,8 +276,20 @@
<images>
<!-- Quay image -->
<image>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
<name>${image.registry}/${image.name}:${project.version}</name>
<build>
<buildx>
<builderName>${builder.name}</builderName>
<platforms>
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
<BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
</args>
</build>
</image>
</images>
</configuration>
@@ -169,6 +300,28 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<executions>
<execution>
<id>prepare-buildx</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${scripts.directory}/prepare_buildx.sh</executable>
<arguments>
<argument>${builder.name}</argument>
<argument>${image.registry}</argument>
<argument>${image.name}</argument>
<argument>${image.tag}</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

View File

@@ -1,5 +1,6 @@
### Apply AGS community share AMP to Share image
FROM alfresco/alfresco-share-base:${share.image.tag}
ARG BASE_IMAGE
FROM ${BASE_IMAGE}
LABEL quay.expires-after=${docker.quay-expires.value}

View File

@@ -8,12 +8,14 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<properties>
<image.name>alfresco/alfresco-governance-share-community</image.name>
<docker.quay-expires.value>NEVER</docker.quay-expires.value>
<base.image>alfresco/alfresco-share-base:${share.image.tag}</base.image>
<scripts.directory>${project.parent.parent.basedir}/scripts/dev</scripts.directory>
</properties>
<build>
@@ -58,6 +60,12 @@
<images>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<args>
<BASE_IMAGE>${base.image}</BASE_IMAGE>
</args>
<contextDir>${project.basedir}</contextDir>
</build>
</image>
</images>
</configuration>
@@ -75,6 +83,70 @@
</build>
</profile>
<profile>
<id>build-multiarch-docker-images</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<images>
<image>
<name>${local.registry}/${image.name}:${image.tag}</name>
<build>
<buildx>
<builderName>${builder.name}</builderName>
<platforms>
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
<BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
</args>
</build>
</image>
</images>
</configuration>
<executions>
<execution>
<id>build-push-image</id>
<phase>install</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<executions>
<execution>
<id>prepare-buildx</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${scripts.directory}/prepare_buildx.sh</executable>
<arguments>
<argument>${builder.name}</argument>
<argument>${image.registry}</argument>
<argument>${image.name}</argument>
<argument>${image.tag}</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>push-docker-images</id>
<!-- publishes "image:latest" to Quay -->
@@ -87,8 +159,20 @@
<images>
<!-- Quay image -->
<image>
<name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry>
<name>${image.registry}/${image.name}:${image.tag}</name>
<build>
<buildx>
<builderName>${builder.name}</builderName>
<platforms>
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
<BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
</args>
</build>
</image>
</images>
</configuration>
@@ -103,6 +187,28 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<executions>
<execution>
<id>prepare-buildx</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${scripts.directory}/prepare_buildx.sh</executable>
<arguments>
<argument>${builder.name}</argument>
<argument>${image.registry}</argument>
<argument>${image.name}</argument>
<argument>${image.tag}</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
@@ -124,6 +230,19 @@
<!-- DockerHub image -->
<image>
<name>${image.name}:${project.version}</name>
<build>
<buildx>
<builderName>${builder.name}</builderName>
<platforms>
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
<BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
</args>
</build>
</image>
</images>
</configuration>
@@ -139,8 +258,20 @@
<images>
<!-- Quay image -->
<image>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
<name>${image.registry}/${image.name}:${project.version}</name>
<build>
<buildx>
<builderName>${builder.name}</builderName>
<platforms>
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
<BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
</args>
</build>
</image>
</images>
</configuration>
@@ -151,6 +282,28 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<executions>
<execution>
<id>prepare-buildx</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${scripts.directory}/prepare_buildx.sh</executable>
<arguments>
<argument>${builder.name}</argument>
<argument>${image.registry}</argument>
<argument>${image.name}</argument>
<argument>${image.tag}</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

View File

@@ -7,6 +7,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
</project>

12
pom.xml
View File

@@ -3,19 +3,19 @@
<artifactId>acs-community-packaging</artifactId>
<packaging>pom</packaging>
<name>Alfresco Content Services Community Packaging</name>
<version>7.4.0-A18</version>
<version>7.4.0</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>20.90</version>
<version>20.161</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>20.90</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>20.82</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.4.0-A18</dependency.acs-packaging.version> <!-- for Share distribution zip -->
<dependency.alfresco-community-repo.version>20.161</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>20.163</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.4.0</dependency.acs-packaging.version> <!-- for Share distribution zip -->
<repo.image.tag>${dependency.alfresco-community-repo.version}</repo.image.tag>
<share.image.tag>${dependency.alfresco-community-share.version}</share.image.tag>
@@ -25,7 +25,7 @@
<connection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</connection>
<developerConnection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</developerConnection>
<url>https://github.com/Alfresco/acs-community-packaging</url>
<tag>7.4.0-A18</tag>
<tag>7.4.0</tag>
</scm>
<distributionManagement>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<packaging>pom</packaging>

View File

@@ -6,6 +6,28 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
source "$(dirname "${BASH_SOURCE[0]}")/build_functions.sh"
usage() {
echo "Builds the upstream projects first, then the current one." 1>&2;
echo 1>&2;
echo "Usage: $0 [-m]" 1>&2;
echo " -m: Flag to build Docker images with multi-architecture" 1>&2;
echo " -h: Display the usage information" 1>&2;
exit 1;
}
while getopts "mh" option; do
case $option in
m)
DOCKER_BUILD_PROFILE=build-multiarch-docker-images
;;
h)
usage
;;
esac
done
BUILD_PROFILE=${DOCKER_BUILD_PROFILE:-build-docker-images}
COM_DEPENDENCY_VERSION="$(retrievePomProperty "dependency.alfresco-community-repo.version")"
REPO_IMAGE=$([[ "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && echo "-Drepo.image.tag=latest" || echo)
@@ -32,9 +54,9 @@ UPSTREAM_REPO="github.com/Alfresco/alfresco-community-repo.git"
# Search, checkout and build the same branch on the upstream project in case of SNAPSHOT dependencies
# Otherwise, checkout the upstream tag and build its Docker image (use just "mvn package", without "mvn install")
if [[ "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] ; then
pullAndBuildSameBranchOnUpstream "${UPSTREAM_REPO}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true"
pullAndBuildSameBranchOnUpstream "${UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true"
else
pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true"
pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true"
fi
SHARE_DEPENDENCY_VERSION="$(retrievePomProperty "dependency.alfresco-community-share.version")"
@@ -55,13 +77,13 @@ fi
SHARE_UPSTREAM_REPO="github.com/Alfresco/alfresco-community-share.git"
# Checkout the upstream share project (tag or branch; + build if the latter)
if [[ "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] ; then
pullAndBuildSameBranchOnUpstream "${SHARE_UPSTREAM_REPO}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER ${REPO_IMAGE} -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
pullAndBuildSameBranchOnUpstream "${SHARE_UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER ${REPO_IMAGE} -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
else
pullUpstreamTagAndBuildDockerImage "${SHARE_UPSTREAM_REPO}" "${SHARE_DEPENDENCY_VERSION}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
pullUpstreamTagAndBuildDockerImage "${SHARE_UPSTREAM_REPO}" "${SHARE_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
fi
# Build the current project
mvn -B -ntp -V -q install -DskipTests -Dmaven.javadoc.skip=true -Pbuild-docker-images -Pags ${REPO_IMAGE} ${SHARE_IMAGE}
mvn -B -ntp -V -q install -DskipTests -Dmaven.javadoc.skip=true -P$BUILD_PROFILE -Pags ${REPO_IMAGE} ${SHARE_IMAGE}
popd

View File

@@ -17,7 +17,7 @@ DESTINATION="s3://eu.dl.alfresco.com/release/community/RM/${RELEASE_VERSION}"
printf "\n%s\n%s\n" "${SOURCE}" "${DESTINATION}"
aws s3 cp --acl private --recursive "${SOURCE}" "${DESTINATION}"
aws s3 cp --acl private --recursive --copy-props none "${SOURCE}" "${DESTINATION}"
set +vex
echo "=========================== Finishing Copy to Release Bucket Script =========================="

View File

@@ -17,7 +17,7 @@ DESTINATION="s3://eu.dl.alfresco.com/release/community/${RELEASE_VERSION}-build-
printf "\n%s\n%s\n" "${SOURCE}" "${DESTINATION}"
aws s3 cp --acl private --recursive "${SOURCE}" "${DESTINATION}"
aws s3 cp --acl private --recursive --copy-props none "${SOURCE}" "${DESTINATION}"
set +vex
echo "=========================== Finishing Copy to Release Bucket Script =========================="

21
scripts/dev/prepare_buildx.sh Executable file
View File

@@ -0,0 +1,21 @@
#!/usr/bin/env bash
BUILDER_NAME="${1}"
TARGET_REGISTRY="${2}"
TARGET_IMAGE="${3}"
IMAGE_TAG="${4}"
#Create a `docker-container` builder with host networking and required flags (quay.io)
docker --config target/docker/"${TARGET_REGISTRY}"/"${TARGET_IMAGE}"/"${IMAGE_TAG}"/docker \
buildx create --use --name "${BUILDER_NAME}" --driver-opt network=host \
--buildkitd-flags '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host'
#Create a `docker-container` builder with host networking and required flags (docker.io)
docker --config target/docker/"${TARGET_IMAGE}"/"${IMAGE_TAG}"/docker \
buildx create --use --name "${BUILDER_NAME}" --driver-opt network=host \
--buildkitd-flags '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host'
#Create a `docker-container` builder with host networking and required flags (local registry)
docker --config target/docker/127.0.0.1/5000/"${TARGET_IMAGE}"/"${IMAGE_TAG}"/docker \
buildx create --use --name "${BUILDER_NAME}" --driver-opt network=host \
--buildkitd-flags '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host'

View File

@@ -1,3 +1,3 @@
SOLR6_TAG=2.0.3
SOLR6_TAG=2.0.7-A5
POSTGRES_TAG=14.4
ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<modules>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<properties>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0-A18</version>
<version>7.4.0</version>
</parent>
<developers>