Skip to content

Commit

Permalink
Add Ubuntu 22.04 execution container; Use machine's architecture name…
Browse files Browse the repository at this point in the history
… for local builds. (#264)
  • Loading branch information
haiqi96 authored Feb 5, 2024
1 parent 59b2c22 commit 51df592
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 3 deletions.
22 changes: 20 additions & 2 deletions tools/docker-images/clp-execution-base-focal/build.sh
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
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
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
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
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

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

0 comments on commit 51df592

Please sign in to comment.