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.

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

Support for ARM64 #343

Merged
merged 4 commits into from
Sep 29, 2021
Merged

Support for ARM64 #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02a5952
ARM64 Support - Stephen
ntwb Sep 19, 2021
d0a266e
Use newer minio container for minio client command
roborourke Sep 28, 2021
de974c3
Use pinned container versions
roborourke Sep 28, 2021
19c15fc
Fix tachyon and PHP tags
roborourke Sep 29, 2021
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 docker/minio.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "9",
"version": "10",
"hosts": {
"local": {
"url": "http://s3:9000",
Expand Down
2 changes: 1 addition & 1 deletion inc/composer/class-command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ protected function minio_client( string $command ) {
'--volume=%3$s/vendor/altis/local-server/docker/minio.json:/root/.mc/config.json ' .
'--volume=%3$s/content/uploads:/content/uploads:delegated ' .
'--network=%4$s_default ' .
'minio/mc:RELEASE.2020-03-14T01-23-37Z %5$s',
'minio/mc:RELEASE.2021-09-02T09-21-27Z %5$s',
$columns,
$lines,
getcwd(),
Expand Down
20 changes: 10 additions & 10 deletions inc/composer/class-docker-compose-generator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ protected function get_php_reusable() : array {
'condition' => 'service_started',
],
],
'image' => 'humanmade/altis-local-server-php:4.0.0-dev',
'image' => 'humanmade/altis-local-server-php:4.2.0',
Copy link
Member

Choose a reason for hiding this comment

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

@roborourke -dev IIRC is the dev container, not a "dev version" that has xdebug intsalled: https://github.com/humanmade/docker-wordpress-php/blob/master/Dockerfile-dev. Did we stop using -dev just for the tag (and it's built from -dev?)-- sorry I can't remember but wanted to check, as I think it might have even been me who made that change!

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah gotcha, yeah so the GitHub workflow uses the Dockerfile-dev file to build. It wasn't a dev container - it was always just used to reference the version that had Xdebug installed. I think that's fine personally as Xdebug 3 can be present and have minimal impact. Plus we don't use the builds on Docker hub on our infrastructure.

Copy link
Contributor

@roborourke roborourke Sep 29, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

I didn't make that particular change, I just didn't notice it earlier - I thought we still had the regular tag and tag + -dev with Xdebug being built and pushed up.

The -dev suffix was previously how we toggled between a container with Xdebug and one without, but we use the XDEBUG_MODE env var to switch it on or off now.

'links' => [
'db:db-read-replica',
's3:s3.localhost',
Expand Down Expand Up @@ -200,7 +200,7 @@ protected function get_service_cavalcade() : array {
protected function get_service_nginx() : array {
return [
'nginx' => [
'image' => 'humanmade/altis-local-server-nginx:3.3.0',
'image' => 'humanmade/altis-local-server-nginx:3.4.0',
'networks' => [
'proxy',
'default',
Expand Down Expand Up @@ -256,7 +256,7 @@ protected function get_service_redis() : array {
protected function get_service_db() : array {
return [
'db' => [
'image' => 'mysql:5.7',
'image' => 'biarms/mysql:5.7',
'volumes' => [
'db-data:/var/lib/mysql',
],
Expand Down Expand Up @@ -416,7 +416,7 @@ protected function get_service_kibana() : array {
protected function get_service_s3() : array {
return [
's3' => [
'image' => 'minio/minio:RELEASE.2020-03-19T21-49-00Z',
'image' => 'minio/minio:RELEASE.2021-09-18T18-09-59Z',
'volumes' => [
's3:/data:rw',
],
Expand Down Expand Up @@ -455,7 +455,7 @@ protected function get_service_s3() : array {
],
],
's3-sync-to-host' => [
'image' => 'minio/mc:RELEASE.2020-03-14T01-23-37Z',
'image' => 'minio/mc:RELEASE.2021-09-02T09-21-27Z',
'restart' => 'unless-stopped',
'depends_on' => [
's3',
Expand All @@ -480,7 +480,7 @@ protected function get_service_s3() : array {
protected function get_service_tachyon() : array {
return [
'tachyon' => [
'image' => 'humanmade/tachyon:2.3.2',
'image' => 'humanmade/tachyon:v2.4.0',
'ports' => [
'8080',
],
Expand Down Expand Up @@ -513,7 +513,7 @@ protected function get_service_tachyon() : array {
protected function get_service_mailhog() : array {
return [
'mailhog' => [
'image' => 'mailhog/mailhog:latest',
'image' => 'cd2team/mailhog:1632011321',
'ports' => [
'8025',
'1025',
Expand Down Expand Up @@ -551,7 +551,7 @@ protected function get_service_analytics() : array {
'default',
],
'restart' => 'unless-stopped',
'image' => 'humanmade/local-cognito:1.0.0',
'image' => 'humanmade/local-cognito:1.1.0',
'labels' => [
'traefik.port=3000',
'traefik.protocol=http',
Expand All @@ -568,7 +568,7 @@ protected function get_service_analytics() : array {
'default',
],
'restart' => 'unless-stopped',
'image' => 'humanmade/local-pinpoint:1.2.3',
'image' => 'humanmade/local-pinpoint:1.3.0',
'labels' => [
'traefik.port=3000',
'traefik.protocol=http',
Expand All @@ -590,7 +590,7 @@ protected function get_service_analytics() : array {
protected function get_service_xray() : array {
return [
'xray' => [
'image' => 'amazon/aws-xray-daemon:3.0.1',
'image' => 'amazon/aws-xray-daemon:3.3.3',
'ports' => [
'2000',
],
Expand Down