Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ updateall_log.txt
etc
snap-*
LICENSE.html
Dockerfile
certificates/
16 changes: 10 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,18 @@ variables:
-Djava.awt.headless=true
-Dmaven.test.skip=true
-Dnetbeans.verify.integrity=false
# DOCKER_BUILD_TOOL: buildah
DOCKER_REGISTRY_MIRROR: docker.snap-ci.ovh
DOCKER_REGISTRY_USER: $NEXUS_USER
DOCKER_REGISTRY_PASSWORD: $NEXUS_PASSWORD
DOCKER_FILE: "docker/build/Dockerfile"
DOCKER_CONTEXT_PATH: "${CI_PROJECT_DIR}"
DOCKER_SNAPSHOT_IMAGE: "$NEXUS_URL/$CI_PROJECT_NAME:unix-snapshot-latest"
DOCKER_RELEASE_IMAGE: "$NEXUS_URL/$CI_PROJECT_NAME:unix-latest"
DOCKER_SNAPSHOT_IMAGE: "$NEXUS_URL/$CI_PROJECT_NAME:unix-snapshot-pRC10"
DOCKER_RELEASE_IMAGE: "$NEXUS_URL/$CI_PROJECT_NAME:unix-pRC10"
DOCKER_TRIVY_ARGS: "${DOCKER_TRIVY_ARGS} --timeout 15m"
DOCKER_BUILD_ARGS: "--cache=true --compressed-caching=false --use-new-run --cleanup --build-arg LICENSE=${INSTALL4J_LICENSE} --build-arg=UPLOAD_URL --build-arg=NEXUS_USER --build-arg=NEXUS_PASS --target=unix"
DOCKER_BUILD_ARGS: "--cache=true --compressed-caching=false --use-new-run --cleanup --build-arg LICENSE=${INSTALL4J_LICENSE} --build-arg=UPLOAD_URL --build-arg=NEXUS_USER --build-arg=NEXUS_PASS --build-arg=MACOS_SIGNING --target=unix"
DOCKER_HADOLINT_ARGS: --failure-threshold error
DOCKER_PROD_PUBLISH_STRATEGY: auto
COMPILE_BRANCH: master
COMPILE_BRANCH: release-pRC-10
RECOMPILE: "true"

stages:
Expand Down Expand Up @@ -67,6 +66,11 @@ build:
COMPILE_BRANCH: $BRANCH
when: always
- when: always
image: registry.hub.docker.com/library/ubuntu:latest
before_script:
- apt-get -qq update && apt-get -qqy upgrade && apt-get -qqy install curl
script:
- curl -s https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer | bash
needs:
- job: compile
# optional: true
Expand All @@ -90,10 +94,10 @@ build:
job: mvn-build
ref: $COMPILE_BRANCH
artifacts: true
script: echo build-snap
artifacts:
expire_in: 2 hours
paths:
- $SECURE_FILES_DOWNLOAD_PATH
- LICENSE.html
- etc
- "${CI_PROJECT_DIR}/snap-application/target"
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ In case you want to build the docker image locally

Then `docker run -i -l snap-installer docker-hosted.snap-ci.ovh/snap-installer:latest`

> Note: you have to either create a `certificates` folder at project root and put the snap certificate for macos or edit snap.install4j file.

### Pull snap docker image

`docker pull docker.snap-ci.ovh/snap-installer:latest`
Expand Down
4 changes: 3 additions & 1 deletion docker/build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ RUN mkdir -p ${DEST}/snap-installer ${DEST}/snap-installer/files ${DEST}/snap-in
${DEST}/opttbx-kit/target/netbeans_clusters/opttbx/

COPY snap.install4j LICENSE.txt VERSION.txt ${DEST}/snap-installer/
COPY certificates/ ${DEST}/certificates/
COPY files/ ${DEST}/snap-installer/files/
COPY images/ ${DEST}/snap-installer/images/
COPY LICENSE.html ${DEST}/snap-engine/
Expand All @@ -161,9 +162,10 @@ COPY smos-kit/target/netbeans_clusters/smos/ ${DEST}/smos-box/smos-kit/target/ne

# Create installers
ARG LICENSE
ARG MACOS_SIGNING
ARG USER_HOME_DIR="/home/snap"

RUN install4jc -q -d ${USER_HOME_DIR} -L ${LICENSE} -m unixInstaller,macosFolder,windows ${DEST}/snap-installer/snap.install4j && \
RUN install4jc -q -d ${USER_HOME_DIR} -L ${LICENSE} -m unixInstaller,macosFolder,windows ${DEST}/snap-installer/snap.install4j --mac-keystore-password=MACOS_SIGNING --disable-notarization && \
chmod 777 ${USER_HOME_DIR}/esa-* && \
rm ${USER_HOME_DIR}/*x32* && rm ${USER_HOME_DIR}/*smos* && rm ${USER_HOME_DIR}/*sentinel* && \
rm -rf ${DEST} \
Expand Down
2 changes: 1 addition & 1 deletion docker/build/scripts/upload.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ do
if [[ "${file}" =~ ^esa-snap_all* ]]
then
export OS=$(echo "$file" | grep -oP "(unix|windows|macos)")
export VERSION=$(echo "$file" | grep -oP "(1[0-9]{1,2})(_)([0-9]*)(_)([0-9]*)")
export VERSION=pRC10
export EXT=""
export GROUP="installers"
export REPO="snap-maven-releases"
Expand Down
3 changes: 2 additions & 1 deletion snap.install4j
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<variable name="snapGptMenuName" value="SNAP GPT" />
<variable name="smosGridPointExporter" value="smos-grid-point-exporter" />
</variables>
<codeSigning macEnabled="true" macPkcs12File="../certificates/apple-dev-certificates.p12" />
<jreBundles jdkProviderId="Liberica" release="11/11.0.19+7" />
</application>
<files missingFilesStrategy="error" defaultUninstallMode="2" launcherOverwriteMode="1">
Expand Down Expand Up @@ -1933,5 +1934,5 @@ return console.askYesNo(message, true);
<buildIds buildAll="false">
<mediaSet refId="3551" />
</buildIds>
<buildOptions faster="true" disableSigning="true" />
<buildOptions faster="true" disableSigning="false" />
</install4j>