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

Add Ubuntu 22.04 execution container; Use machine's architecture name for local builds. #264

Merged
merged 2 commits into from
Feb 5, 2024
Merged

Add Ubuntu 22.04 execution container; Use machine's architecture name for local builds. #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
644c021
support arm64 container
haiqi96 Feb 5, 2024
4e857ec
fixes
haiqi96 Feb 5, 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
22 changes: 20 additions & 2 deletions tools/docker-images/clp-execution-base-focal/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
#!/bin/bash
#!/usr/bin/env bash

# Exit on any error
set -e

# Error on undefined variable
set -u

script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
repo_root=${script_dir}/../../../

docker build -t clp-execution-x86-ubuntu-focal:dev ${repo_root} --file ${script_dir}/Dockerfile
arch=$(uname -m)

if [ "$arch" = "x86_64" ]; then
arch_name="x86"
elif [ "$arch" = "aarch64" ]; then
arch_name="arm64"
else
echo "Error: Unsupported architecture - $arch"
exit 1
fi

docker build -t clp-execution-${arch_name}-ubuntu-focal:dev ${repo_root} \
--file ${script_dir}/Dockerfile
2 changes: 1 addition & 1 deletion tools/docker-images/clp-execution-base-focal/setup-scripts/install-prebuilt-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# Exit on any error
set -e
Expand Down
15 changes: 15 additions & 0 deletions tools/docker-images/clp-execution-base-jammy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM ubuntu:jammy

WORKDIR /root

RUN mkdir -p ./tools/docker-images/clp-execution-base-jammy
ADD ./tools/docker-images/clp-execution-base-jammy/setup-scripts ./tools/docker-images/clp-execution-base-jammy/setup-scripts

RUN mkdir -p ./tools/scripts/lib_install
ADD ./components/core/tools/scripts/lib_install ./tools/scripts/lib_install

RUN ./tools/docker-images/clp-execution-base-jammy/setup-scripts/install-prebuilt-packages.sh

# Reset the working directory so that it's accessible by any user who runs the
# container
WORKDIR /
24 changes: 24 additions & 0 deletions tools/docker-images/clp-execution-base-jammy/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash

# Exit on any error
set -e

# Error on undefined variable
set -u

script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
repo_root=${script_dir}/../../../

arch=$(uname -m)

if [ "$arch" = "x86_64" ]; then
arch_name="x86"
elif [ "$arch" = "aarch64" ]; then
arch_name="arm64"
else
echo "Error: Unsupported architecture - $arch"
exit 1
fi

docker build -t clp-execution-${arch_name}-ubuntu-jammy:dev ${repo_root} \
--file ${script_dir}/Dockerfile
16 changes: 16 additions & 0 deletions tools/docker-images/clp-execution-base-jammy/setup-scripts/install-prebuilt-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env bash

# Exit on any error
set -e

# Error on undefined variable
set -u
kirkrodrigues marked this conversation as resolved.
Show resolved Hide resolved

apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y \
checkinstall \
curl \
libmariadb-dev \
python3 \
rsync \
zstd
Loading