inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-1110 replace fabric8 with docker-maven-plugin (#236)

Browse Source
This commit is contained in:
Marcello Teodori
2021-01-11 18:56:24 +01:00
committed by GitHub
parent 3195c93a9e
commit de6022db01
4 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@@ -131,16 +131,6 @@ cd ..
In Intellij IDEA, create a new project using the `work` directory as the source. In Intellij IDEA, create a new project using the `work` directory as the source.
* File > New Project from Existing Sources > .../work > Maven * File > New Project from Existing Sources > .../work > Maven
## Docker
We generally use Docker for testing. In order to reduce the size of images we also supply a squash option that collapses
the layers in the image. This is a long-standing experimental feature that we have fould useful. However you will need
to enable experimental features in your Docker Engine.
~~~
{
"experimental": true,
"debug": true
}
~~~
## Branches ## Branches
As multiple projects have been combined, branch names use the ACS version they are targeting. As multiple projects have been combined, branch names use the ACS version they are targeting.
For example the code used to create the repository in ACS 6.2.1 is a branch called `releases/6.2.1`. For example the code used to create the repository in ACS 6.2.1 is a branch called `releases/6.2.1`.

22
packaging/docker-alfresco/pom.xml
View File

@@ -134,17 +134,11 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration> <configuration>
<images> <images>
<image> <image>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image> </image>
</images> </images>
</configuration> </configuration>
@@ -169,29 +163,17 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration> <configuration>
<images> <images>
<!-- Quay image --> <!-- Quay image -->
<image> <image>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image> </image>
<!-- DockerHub image --> <!-- DockerHub image -->
<image> <image>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image> </image>
</images> </images>
</configuration> </configuration>

4
pom.xml
View File

@@ -653,8 +653,8 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<version>4.4.0</version> <version>0.34.1</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>

4
scripts/travis/init.sh
View File

@@ -14,10 +14,6 @@ if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
fi fi
# Enable experimental docker features (for the image squash option)
echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
sudo service docker restart
# not helpful in this script # not helpful in this script
# export HOST_IP=$(hostname -I | cut -f1 -d' ') # export HOST_IP=$(hostname -I | cut -f1 -d' ')