Skip to content
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.

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

More arches (ppc64le + arm64v8) and ubuntu #184

Merged
merged 5 commits into from
Jul 20, 2018

Conversation

yosifkit
Copy link
Contributor

@yosifkit yosifkit commented Jul 17, 2018

--- /dev/fd/63	2018-07-16 16:58:06.581643956 -0700
+++ /dev/fd/62	2018-07-16 16:58:06.578643898 -0700
@@ -1,25 +1,30 @@
-# this file is generated via https://github.com/docker-library/mariadb/blob/9ce4ecd2783d2358d2c0fe0efa924ecae33d9e84/generate-stackbrew-library.sh
+# this file is generated via https://github.com/docker-library/mariadb/blob/852044c20cd24a94bb15d8fcdb7b0784a40110d9/generate-stackbrew-library.sh
 
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon),
              Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/mariadb.git
 
-Tags: 10.3.8-jessie, 10.3-jessie, 10-jessie, jessie, 10.3.8, 10.3, 10, latest
-GitCommit: a7d1a184913c009c473baeb8f72385d12ae0de61
+Tags: 10.3.8-bionic, 10.3-bionic, 10-bionic, bionic, 10.3.8, 10.3, 10, latest
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 852044c20cd24a94bb15d8fcdb7b0784a40110d9
 Directory: 10.3
 
-Tags: 10.2.16-jessie, 10.2-jessie, 10.2.16, 10.2
-GitCommit: 1e7c5c9bb2bfde0453fb52175343a360ed346104
+Tags: 10.2.16-bionic, 10.2-bionic, 10.2.16, 10.2
+Architectures: amd64, arm64v8, i386, ppc64le
+GitCommit: 852044c20cd24a94bb15d8fcdb7b0784a40110d9
 Directory: 10.2
 
-Tags: 10.1.34-jessie, 10.1-jessie, 10.1.34, 10.1
-GitCommit: 12a0273332a3a0ed007ece2ae5886f7ac9c15d1b
+Tags: 10.1.34-bionic, 10.1-bionic, 10.1.34, 10.1
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 852044c20cd24a94bb15d8fcdb7b0784a40110d9
 Directory: 10.1
 
-Tags: 10.0.35-jessie, 10.0-jessie, 10.0.35, 10.0
-GitCommit: 20b1413b646df9a45df2d4dcc5c5c89ecb42c0b1
+Tags: 10.0.35-xenial, 10.0-xenial, 10.0.35, 10.0
+Architectures: amd64, arm64v8, i386, ppc64le
+GitCommit: 852044c20cd24a94bb15d8fcdb7b0784a40110d9
 Directory: 10.0
 
-Tags: 5.5.60-wheezy, 5.5-wheezy, 5-wheezy, 5.5.60, 5.5, 5
-GitCommit: 20b1413b646df9a45df2d4dcc5c5c89ecb42c0b1
+Tags: 5.5.60-trusty, 5.5-trusty, 5-trusty, 5.5.60, 5.5, 5
+Architectures: amd64, i386, ppc64le
+GitCommit: 852044c20cd24a94bb15d8fcdb7b0784a40110d9
 Directory: 5.5

Closes #175
Closes #158
Closes #155
Closes #111

10.0/Dockerfile Outdated
@@ -24,6 +37,7 @@ RUN set -ex; \
export GNUPGHOME="$(mktemp -d)"; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
{ command -v gpgconf > /dev/null && gpgconf --kill all || :; }; \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{ and } aren't needed here since we're already in a semi-colon-ized block (only need those in a series of &&) 😇

10.0/Dockerfile Outdated
echo 'Pin-Priority: 998'; \
} > /etc/apt/preferences.d/percona

# bashbrew-architectures: ppc64le i386 amd64 arm64v8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This ordering is a little odd -- is this just the order Bash spits them out? I wonder if it'll change from Bash version to version (hopefully not).

10.1/Dockerfile Outdated
&& apt-get update \
&& apt-get install -y \
} | debconf-set-selections; \
XTRABACKUP='mariadb-backup-10.1'; \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we call this variable just backupPackage or something instead? (since it's now preferred to not use xtrabackup if we can avoid it?)

update.sh Outdated
)
declare -A dpkArchToBashbrew=(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dpkArchToBashbrew should be dpkgArchToBashbrew

update.sh Outdated
if ver="$(getRemoteVersion "$version" "$suite" "$arch")" && [ -n "$ver" ]; then
arches="$arches ${dpkArchToBashbrew[$arch]}"
fi
done
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could use something like echo "$arches" | xargs -n1 | sort | xargs to sort these more deterministically? ala arches="$(echo "$arches" | xargs -n1 | sort | xargs)"?

@yosifkit yosifkit force-pushed the more-arches-also-ubuntu branch 2 times, most recently from 097d434 to 6538ae6 Compare July 20, 2018 19:23
@tianon
Copy link
Contributor

tianon commented Jul 20, 2018

Yay docker-library/php#666 🎉 🍰

…parsing

Also adjust travis to use pgp-happy-eyeballs
@tianon
Copy link
Contributor

tianon commented Jul 20, 2018

Let's do this.

@tianon tianon merged commit 61d3f34 into MariaDB:master Jul 20, 2018
@tianon tianon deleted the more-arches-also-ubuntu branch July 20, 2018 20:14
@grooverdan
Copy link
Member

@yosifkit and @tianon thanks for much for making this happen.

&& apt-get update \
&& apt-get install -y \
} | debconf-set-selections; \
backupPackage='mariadb-backup-10.1'; \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for breaking our existing Galera setup without warning... A heads-up next time will be nice.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm definitely sorry that your setup broke, but to say it was "without warning" is a little bit much.

We only have two ways of informing users of changes to images -- PRs/issues on this repository, and PRs with the library/mariadb label on the official-images repository, of which this change had both, so there's unfortunately really not much more "heads-up" we could provide.
Additionally, I'd heartily recommend setting up some kind of testing environment where you can test image updates before deploying them to ensure that this sort of breakage doesn't affect you in the future.

All that being said, breaking folks wasn't an intention of this change, so it sounds like we need to do more to adapt this. Can you provide more detail about what your setup looks like and how this broke it? Ideally we'd love a couple simplified commands or a compose/stack YAML that can reproduce the failure.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm definitely sorry that your setup broke, but to say it was "without warning" is a little bit much.

I'm sorry it came out a bit harsh.

We only have two ways of informing users of changes to images -- PRs/issues on this repository, and PRs with the library/mariadb label on the official-images repository, of which this change had both, so there's unfortunately really not much more "heads-up" we could provide.

You are correct, but the change (xtrabackup -> mariabackup) should have been mentioned in the commit message (IMHO, its a breaking change).

Additionally, I'd heartily recommend setting up some kind of testing environment where you can test image updates before deploying them to ensure that this sort of breakage doesn't affect you in the future.

It didn't break the cluster, it only broke bootstrapping of new database nodes.

All that being said, breaking folks wasn't an intention of this change, so it sounds like we need to do more to adapt this. Can you provide more detail about what your setup looks like and how this broke it? Ideally we'd love a couple simplified commands or a compose/stack YAML that can reproduce the failure.

Galera use SST for the initial node bootstrapping and you can choose between mysqldump, rsync or xtrabackup/mariabackup. So when xtrabackup was removed, you broke the xtrabackup SST method. It was easy to fix by switching to the mariabackup SST method.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@klausenbusk do you think that we should add a symlink for xtrabackup to mariabackup like you had in #158 or should we just leave it as is?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@klausenbusk do you think that we should add a symlink for xtrabackup to mariabackup like you had in #158 or should we just leave it as is?

Just leave it as it is, a symlink wouldn't solve it anyway.

@tianon
Copy link
Contributor

tianon commented Aug 2, 2018

Just to thread the needle, there were some minor issues with this on arm64v8 which were fixed by #195.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants