Skip to content

Fix arm64v8 detection/code #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 2, 2018
Merged

Fix arm64v8 detection/code #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions 10.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ RUN set -ex; \
rm -r "$GNUPGHOME"; \
apt-key list

# bashbrew-architectures: amd64 arm64v8 i386 ppc64le
# bashbrew-architectures: amd64 i386 ppc64le
ENV MARIADB_MAJOR 10.0
ENV MARIADB_VERSION 10.0.36+maria-1~xenial

Expand Down Expand Up @@ -120,12 +120,10 @@ RUN set -ex; \
} > /etc/apt/preferences.d/percona; \
# percona-xtrabackup is amd64/i386 only (mariadb-backup is on all arches that mariadb-server is)
dpkgArch="$(dpkg --print-architecture)"; \
if [[ "$backupPackage" == percona* ]]; then \
case "${dpkgArch##*-}" in \
amd64|i386) ;; \
*) backupPackage= ;; \
esac; \
fi; \
case "${backupPackage}_${dpkgArch##*-}" in \
percona*_amd64 | percona*_i386 ) ;; \
*) backupPackage= ;; \
esac; \
##</autogenerated>##
apt-get update; \
apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion 10.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ RUN set -ex; \
rm -r "$GNUPGHOME"; \
apt-key list

# bashbrew-architectures: amd64 arm64v8 i386 ppc64le
# bashbrew-architectures: amd64 arm64v8 ppc64le
ENV MARIADB_MAJOR 10.2
ENV MARIADB_VERSION 1:10.2.16+maria~bionic

Expand Down
10 changes: 4 additions & 6 deletions 5.5/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,10 @@ RUN set -ex; \
} > /etc/apt/preferences.d/percona; \
# percona-xtrabackup is amd64/i386 only (mariadb-backup is on all arches that mariadb-server is)
dpkgArch="$(dpkg --print-architecture)"; \
if [[ "$backupPackage" == percona* ]]; then \
case "${dpkgArch##*-}" in \
amd64|i386) ;; \
*) backupPackage= ;; \
esac; \
fi; \
case "${backupPackage}_${dpkgArch##*-}" in \
percona*_amd64 | percona*_i386 ) ;; \
*) backupPackage= ;; \
esac; \
##</autogenerated>##
apt-get update; \
apt-get install -y \
Expand Down
10 changes: 4 additions & 6 deletions Dockerfile-percona-block
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
} > /etc/apt/preferences.d/percona; \
# percona-xtrabackup is amd64/i386 only (mariadb-backup is on all arches that mariadb-server is)
dpkgArch="$(dpkg --print-architecture)"; \
if [[ "$backupPackage" == percona* ]]; then \
case "${dpkgArch##*-}" in \
amd64|i386) ;; \
*) backupPackage= ;; \
esac; \
fi; \
case "${backupPackage}_${dpkgArch##*-}" in \
percona*_amd64 | percona*_i386 ) ;; \
*) backupPackage= ;; \
esac; \
##</autogenerated>##
4 changes: 2 additions & 2 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ getRemoteVersion() {
echo "$(
curl -fsSL "http://ftp.osuosl.org/pub/mariadb/repo/$version/ubuntu/dists/$suite/main/binary-$dpkgArch/Packages" 2>/dev/null \
| tac|tac \
| awk -F ': ' '$1 == "Package" { pkg = $2; next } $1 == "Version" && pkg == "mariadb-server" { print $2; exit }'
| awk -F ': ' '$1 == "Package" { pkg = $2; next } $1 == "Version" && pkg == "mariadb-server-'"$version"'" { print $2; exit }'
)"
}

Expand Down Expand Up @@ -61,7 +61,7 @@ for version in "${versions[@]}"; do
backup="${xtrabackups[$version]:-$defaultXtrabackup}"

cp Dockerfile.template "$version/Dockerfile"
if [ "$backup" == 'percona-xtrabackup' ]; then
if [ "$backup" = 'percona-xtrabackup' ]; then
gawk -i inplace '
{ print }
/%%BACKUP_PACKAGE%%/ && c == 0 { c = 1; system("cat Dockerfile-percona-block") }
Expand Down