MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-04-12 21:06:35 +02:00
Code Issues Releases Wiki Activity

docker: Reduce extra_packages_devX to single build argument.

Browse source
This commit is contained in:
Jason Volk 2023-04-06 21:48:02 -07:00
parent 7501f983a6
commit 13d21ca83c
3 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/alpine/built/Dockerfile
View file

@ -10,8 +10,6 @@ FROM ${acct}/${repo}:${dist_name}-${dist_version}-${feature}-${machine}
ARG cc ARG cc
ARG cxx ARG cxx
ARG extra_packages_dev ARG extra_packages_dev
ARG extra_packages_dev1
ARG extra_packages_dev2
ARG rocksdb_version 7.4.3 ARG rocksdb_version 7.4.3
ARG rocksdb_url ARG rocksdb_url
ARG ctor_url https://github.com/matrix-construct/construct ARG ctor_url https://github.com/matrix-construct/construct
@ -38,8 +36,6 @@ curl \
git \ git \
libtool \ libtool \
${extra_packages_dev} \ ${extra_packages_dev} \
${extra_packages_dev1} \
${extra_packages_dev2} \
" "
WORKDIR /usr/src WORKDIR /usr/src

30
docker/build-and-push-images.sh
View file

@ -112,22 +112,24 @@ args_dist()
args_toolchain() args_toolchain()
{ {
_name=$(echo $1 | cut -d"-" -f1) _name=$(echo $1 | cut -d"-" -f1)
_version=$(echo $1 | cut -d"-" -f2) _epoch=$(echo $1 | cut -d"-" -f2)
case $2 in case $2 in
alpine) alpine)
toolchain=$_name toolchain=$_name
case $1 in case $1 in
gcc*) gcc*)
args="$args --build-arg extra_packages_dev=gcc" extra_dev="gcc"
args="$args --build-arg extra_packages_dev1=g++" extra_dev="${extra_dev} g++"
args="$args --build-arg extra_packages_dev=\"${extra_dev}\""
args="$args --build-arg cc=gcc --build-arg cxx=g++" args="$args --build-arg cc=gcc --build-arg cxx=g++"
return 0 return 0
;; ;;
clang*) clang*)
args="$args --build-arg extra_packages_dev=clang" extra_dev="clang"
args="$args --build-arg extra_packages_dev1=llvm" extra_dev="${extra_dev} llvm"
args="$args --build-arg extra_packages_dev2=llvm-dev" extra_dev="${extra_dev} llvm-dev"
args="$args --build-arg extra_packages_dev=\"${extra_dev}\""
args="$args --build-arg cc=clang --build-arg cxx=clang++" args="$args --build-arg cc=clang --build-arg cxx=clang++"
test $3 != "3.16" test $3 != "3.16"
return $? return $?
@ -137,16 +139,18 @@ args_toolchain()
ubuntu) ubuntu)
case $1 in case $1 in
gcc*) gcc*)
args="$args --build-arg extra_packages_dev=gcc-${_version}" extra_dev="gcc-${_epoch}"
args="$args --build-arg extra_packages_dev1=g++-${_version}" extra_dev="${extra_dev} g++-${_epoch}"
args="$args --build-arg cc=gcc-${_version} --build-arg cxx=g++-${_version}" args="$args --build-arg extra_packages_dev=\"${extra_dev}\""
args="$args --build-arg cc=gcc-${_epoch} --build-arg cxx=g++-${_epoch}"
return 0 return 0
;; ;;
clang*) clang*)
args="$args --build-arg extra_packages_dev=clang-${_version}" extra_dev="clang-${_epoch}"
args="$args --build-arg extra_packages_dev1=llvm-${_version}-dev" extra_dev="${extra_dev} llvm-${_epoch}"
args="$args --build-arg extra_packages_dev2=llvm-spirv-${_version}" extra_dev="${extra_dev} llvm-spirv-${_epoch}"
args="$args --build-arg cc=clang-${_version} --build-arg cxx=clang++-${_version}" args="$args --build-arg extra_packages_dev=\"${extra_dev}\""
args="$args --build-arg cc=clang-${_epoch} --build-arg cxx=clang++-${_epoch}"
return 0 return 0
;; ;;
esac esac

4
docker/ubuntu/built/Dockerfile
View file

@ -10,8 +10,6 @@ FROM ${acct}/${repo}:${dist_name}-${dist_version}-${feature}-${machine}
ARG cc ARG cc
ARG cxx ARG cxx
ARG extra_packages_dev ARG extra_packages_dev
ARG extra_packages_dev1
ARG extra_packages_dev2
ARG ctor_url https://github.com/matrix-construct/construct ARG ctor_url https://github.com/matrix-construct/construct
ARG machine_spec ARG machine_spec
@ -31,8 +29,6 @@ git \
libtool \ libtool \
shtool \ shtool \
${extra_packages_dev} \ ${extra_packages_dev} \
${extra_packages_dev1} \
${extra_packages_dev2} \
" "
RUN true \ RUN true \