Skip to content

Commit da49a1e

Browse files
author
Bernd Doser
committed
Impl #18: Use the version number of the module name as argument for the Dockerfile
1 parent 569cc04 commit da49a1e

File tree

49 files changed

+122
-629
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+122
-629
lines changed

alpine-3.7/Dockerfile

Lines changed: 0 additions & 20 deletions
This file was deleted.

alpine-3.7/entrypoint.sh

Lines changed: 0 additions & 37 deletions
This file was deleted.

ubuntu-20.04/Dockerfile renamed to alpine/Dockerfile

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,31 @@
1-
FROM ubuntu:20.04
1+
ARG VERSION
22

3-
LABEL maintainer="Bernd Doser <[email protected]>"
4-
5-
ARG TIMEZONE='Europe/Berlin'
6-
ARG DEBIAN_FRONTEND=noninteractive
3+
FROM alpine:$VERSION
74

8-
RUN echo $TIMEZONE > /etc/timezone && \
9-
apt-get update && apt-get install -y tzdata && \
10-
rm /etc/localtime && \
11-
ln -snf /usr/share/zoneinfo/$TIMEZONE /etc/localtime && \
12-
dpkg-reconfigure -f noninteractive tzdata && \
13-
apt-get clean
5+
LABEL maintainer="Bernd Doser <[email protected]>"
146

15-
RUN apt-get update \
16-
&& apt-get install -y --no-install-recommends \
17-
ca-certificates \
7+
RUN apk add --no-cache \
188
curl \
19-
dirmngr \
209
git \
2110
git-svn \
22-
gpg-agent \
2311
make \
24-
ninja-build \
12+
ninja \
2513
python3 \
2614
python3-dev \
2715
python3-pip \
2816
python3-setuptools \
2917
python3-tk \
30-
software-properties-common \
3118
vim \
32-
wget \
33-
&& apt-get clean \
34-
&& rm -rf /var/lib/apt/lists/*
19+
wget
3520

3621
RUN update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 \
3722
&& update-alternatives --install /usr/bin/python python /usr/bin/python3 1
3823

3924
RUN pip install --upgrade pip \
4025
&& hash -r pip3 \
4126
&& pip install \
42-
cmake==3.17.3 \
43-
conan==1.27.0 \
27+
cmake==3.18.0 \
28+
conan==1.28.0 \
4429
pyyaml==5.3.1
4530

4631
# Set aliases
File renamed without changes.
File renamed without changes.

build.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import argparse
1212
import itertools
13+
import os
1314
import subprocess
1415
import sys
1516
import yaml
@@ -56,6 +57,12 @@ def build_images(image_list, args, docker_push):
5657
image_base_version = '-'.join(image[:-1]) + ':' + IMAGE_VERSION
5758
module = image[-1:][0]
5859

60+
module_version = ''
61+
if not os.path.isdir(module):
62+
module, module_version = module.split('-')
63+
print(module)
64+
print(module_version)
65+
5966
cmd = 'docker build'
6067
if args.pull:
6168
cmd += ' --pull'
@@ -64,6 +71,8 @@ def build_images(image_list, args, docker_push):
6471
cmd += ' -t braintwister/' + image_name_version
6572
if len(image) > 1:
6673
cmd += ' --build-arg BASE_IMAGE=braintwister/' + image_base_version
74+
if len(module_version) > 1:
75+
cmd += ' --build-arg VERSION=' + module_version
6776
cmd += ' .'
6877

6978
if args.verbose > 1:

clang-10/Dockerfile

Lines changed: 0 additions & 40 deletions
This file was deleted.

clang-3.8/Dockerfile

Lines changed: 0 additions & 20 deletions
This file was deleted.

clang-3.9/Dockerfile

Lines changed: 0 additions & 20 deletions
This file was deleted.

clang-4/Dockerfile

Lines changed: 0 additions & 21 deletions
This file was deleted.

clang-5/Dockerfile

Lines changed: 0 additions & 22 deletions
This file was deleted.

clang-6/Dockerfile

Lines changed: 0 additions & 22 deletions
This file was deleted.

clang-7/Dockerfile

Lines changed: 0 additions & 38 deletions
This file was deleted.

clang-8/Dockerfile

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)