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
16 changes: 5 additions & 11 deletions .github/workflows/planet-db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

strategy:
matrix:
arch: [ amd64, arm, arm64 ]
arch: [ amd64, arm64 ]

steps:
- name: Checkout Code
Expand Down Expand Up @@ -80,12 +80,9 @@ jobs:
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[0].image = strenv(amd64tag)' - | \
yq e '.manifests[0].platform.architecture = "amd64"' - | \
yq e '.manifests[0].platform.os = "linux"' - | \
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[1].image = strenv(armtag)' - | \
yq e '.manifests[1].platform.architecture = "arm"' - | \
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[1].image = strenv(arm64tag)' - | \
yq e '.manifests[1].platform.architecture = "arm64"' - | \
yq e '.manifests[1].platform.os = "linux"' - | \
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[2].image = strenv(arm64tag)' - | \
yq e '.manifests[2].platform.architecture = "arm64"' - | \
yq e '.manifests[2].platform.os = "linux"' - | \
tee /tmp/MA_manifests/MA_db-init_latest.yaml
manifest_tool push from-spec /tmp/MA_manifests/MA_db-init_latest.yaml

Expand All @@ -101,11 +98,8 @@ jobs:
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[0].image = strenv(amd64tag)' - | \
yq e '.manifests[0].platform.architecture = "amd64"' - | \
yq e '.manifests[0].platform.os = "linux"' - | \
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[1].image = strenv(armtag)' - | \
yq e '.manifests[1].platform.architecture = "arm"' - | \
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[1].image = strenv(arm64tag)' - | \
yq e '.manifests[1].platform.architecture = "arm64"' - | \
yq e '.manifests[1].platform.os = "linux"' - | \
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}" yq e '.manifests[2].image = strenv(arm64tag)' - | \
yq e '.manifests[2].platform.architecture = "arm64"' - | \
yq e '.manifests[2].platform.os = "linux"' - | \
tee /tmp/MA_manifests/MA_db-init_versioned.yaml
manifest_tool push from-spec /tmp/MA_manifests/MA_db-init_versioned.yaml
24 changes: 0 additions & 24 deletions docker/db-init/arm-Dockerfile

This file was deleted.

6 changes: 2 additions & 4 deletions docker/db-init/crosscompile_db-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
ARCH=$1
ACT=$2

if [[ "${ARCH}" == "armv7" ]]; then
TRIPLE="arm-linux-gnueabihf"
GCC="4.8"
elif [[ "${ARCH}" == "armv8" ]]; then
if [[ "${ARCH}" == "armv8" ]]; then
TRIPLE="aarch64-linux-gnu"
GCC="4.8"
else
echo "Error: Unsupported architecture '${ARCH}'" >&2
exit 1
fi

Expand Down
Loading