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

Updates to all porter bundles to build docker images for amd64 platform from arm64 machines locally #3827

Merged
merged 11 commits into from
Jan 23, 2024
Merged

Updates to all porter bundles to build docker images for amd64 platform from arm64 machines locally #3827

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d0ab485
Updated porter bundle docker templates and runtime image to build to …
mpharding Jan 16, 2024
84447bb
Corrected comments incorrectly touched by find/replace
mpharding Jan 16, 2024
0f236b0
added ignore for DL3029 hadolint validation
m1p1h Jan 17, 2024
1de7232
added new line to hadolint config
m1p1h Jan 17, 2024
7185718
removed white space
m1p1h Jan 19, 2024
14dec54
Try fix monitoring dependancy issues
marrobi Jan 19, 2024
09aed3a
updated changelog
m1p1h Jan 19, 2024
1f3d4b2
Try fix monitoring dependancy issues try 2
marrobi Jan 19, 2024
2d4817d
increase versions
marrobi Jan 19, 2024
dc408dd
Add resource detectors to prevent exceptions, and force unit tests to…
marrobi Jan 22, 2024
bbd19e2
update core version
marrobi Jan 22, 2024
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
1 change: 1 addition & 0 deletions .github/linters/.hadolint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ ignored:
# sometimes pinned versions are removed from the package source so we decided to ignore this rule.
- DL3008
- DL3018
- DL3029
10 changes: 9 additions & 1 deletion devops/scripts/bundle_runtime_image_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,15 @@ if [ -n "${CI_CACHE_ACR_NAME:-}" ]; then
docker_cache+=("--cache-from" "${CI_CACHE_ACR_NAME}${acr_domain_suffix}/${IMAGE_NAME_PREFIX}/${image_name}:${version}")
fi

docker build --build-arg BUILDKIT_INLINE_CACHE=1 \
ARCHITECTURE=$(docker info --format "{{ .Architecture }}" )
m1p1h marked this conversation as resolved.
Show resolved Hide resolved

if [ "${ARCHITECTURE}" == "aarch64" ]; then
DOCKER_BUILD_COMMAND="docker buildx build --platform linux/amd64"
else
DOCKER_BUILD_COMMAND="docker build"
fi

${DOCKER_BUILD_COMMAND} --build-arg BUILDKIT_INLINE_CACHE=1 \
-t "${FULL_IMAGE_NAME_PREFIX}/${image_name}:${version}" \
"${docker_cache[@]}" -f "${docker_file}" "${docker_context}"

2 changes: 1 addition & 1 deletion templates/shared_services/admin-vm/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/shared_services/airlock_notifier/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/shared_services/certs/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM python:3.8-slim-bullseye
FROM --platform=linux/amd64 python:3.8-slim-bullseye

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/shared_services/cyclecloud/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/shared_services/databricks-auth/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/shared_services/firewall/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/shared_services/gitea/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/shared_services/sonatype-nexus-vm/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/workspace_services/azureml/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/workspace_services/azureml/user_resources/aml_compute/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/workspace_services/databricks/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/workspace_services/gitea/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/workspace_services/guacamole/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion ...rkspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion ...rkspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion ...lates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion ...tes/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/workspace_services/health-services/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/workspace_services/innereye/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/workspace_services/mlflow/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/workspace_services/mysql/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/workspace_services/ohdsi/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/workspaces/airlock-import-review/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/workspaces/base/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
2 changes: 1 addition & 1 deletion templates/workspaces/unrestricted/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile-upstream:1.4.0
FROM debian:bullseye-slim
FROM --platform=linux/amd64 debian:bullseye-slim

# PORTER_INIT

Expand Down
Loading