diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-07-11 17:01:17 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-09-07 06:32:01 +0000 |
| commit | fed87b8bd6d965218e6866c26a5b382261ee4b3d (patch) | |
| tree | 3f1f917d0c75e52514ce5e93addb5629df01b8b3 /trusty-armhf-tcwg-base | |
| parent | 9729e277bfebe96d3b7dd27947da27834fe6e4a0 (diff) | |
*-tcwg-dev: Add support for using C preprocessor on Dockerfiles
This patch enables generation of TCWG dockerfiles from templates.
The templates and generation scripts reside under tcwg-base/ hierarchy.
The handling of actual image directories (e.g., <distro>-<arch>-tcwg-*)
is unchanged. It is responsibility of developer who is committing a change
to dockerfile template to run generate-dockerfiles.sh script to update
and commit changes to the affected image directories.
This patch adds a new script cpp-script.sh, which enables C-style
preprocessing on shell-like files, including Dockerfiles. This is
done using "unifdef".
Additionally, the preprocessor script supports variables via "--var/-v"
option. Providing "-v ARCH=amd64" will have effect of "#define ARCH_amd64 1"
in the file and also substitute "sed -e s/#{ARCH}/amd64/g".
For now only *-tcwg-dev images are converted to test-drive the new approach.
There are no changes in generated Dockerfile beyond those in this commit.
Change-Id: I19bc1e8a3d05bcfed39792f6b7ad329d84c995c1
Diffstat (limited to 'trusty-armhf-tcwg-base')
| -rw-r--r-- | trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/Dockerfile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/Dockerfile index c8c61248..87c8ba4d 100644 --- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/Dockerfile +++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/Dockerfile @@ -18,6 +18,7 @@ RUN apt-get update \ git-gui \ git-review \ git-svn \ + gnat \ less \ locales \ libgmp-dev \ |