Merge pull request telefonicaid#4422 from fisuda/update/dockerfile

ADD IMAGE_NAME arg to Dockerfile
fisuda · Sep 11, 2023 · dabd64b · dabd64b
2 parents 22af6eb + 18f42ac
commit dabd64b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -19,8 +19,9 @@
 # iot_support at tid dot es
 #
 
+ARG  IMAGE_NAME=debian
 ARG  IMAGE_TAG=12.1-slim
-FROM debian:${IMAGE_TAG}
+FROM ${IMAGE_NAME}:${IMAGE_TAG}
 
 ARG GITHUB_ACCOUNT=telefonicaid
 ARG GITHUB_REPOSITORY=fiware-orion

diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine
@@ -22,8 +22,9 @@
 # FIXME the change from mongoc driver 1.23.1 to 1.24.1 (PR https://github.com/telefonicaid/fiware-orion/pull/4415)
 # has not been actually tested. Remove this FIXME mark after succesfull test
 
+ARG  IMAGE_NAME=alpine
 ARG  IMAGE_TAG=3.16.0
-FROM alpine:${IMAGE_TAG}
+FROM ${IMAGE_NAME}:${IMAGE_TAG}
 
 ARG GITHUB_ACCOUNT=telefonicaid
 ARG GITHUB_REPOSITORY=fiware-orion

diff --git a/docker/README.jp.md b/docker/README.jp.md
@@ -128,7 +128,8 @@ Orion Context Broker を試してみたいし、データベースについて
 
 | ARG             | 説明                                                           | 例                              |
 | --------------- | -------------------------------------------------------------- | ------------------------------- |
-| IMAGE_TAG       | ベース・イメージのタグを指定します                             | --build-arg IMAGE_TAG=centos7   |
+| IMAGE_NAME      | ベース・イメージの名前を指定します                             | --build-arg IMAGE_NAME=ubuntu   |
+| IMAGE_TAG       | ベース・イメージのタグを指定します                             | --build-arg IMAGE_TAG=22.04     |
 | GIT_NAME        | GitHub リポジトリのユーザ名を指定します                        | --build-arg GIT_NAME=fiware-ges |
 | GIT_REV_ORION   | ビルドする Orion バージョンを指定します                        | --build-arg GIT_REV_ORION=2.3.0 |
 | CLEAN_DEV_TOOLS | 開発ツールをクリアするかどうかを指定します。0 の場合は残ります | --build-arg CLEAN_DEV_TOOLS=0   |

diff --git a/docker/README.md b/docker/README.md
@@ -130,7 +130,8 @@ The parameter `--build-arg` in the `docker build` can be set build-time variable
 
 | ARG             | Description                                                         | Example                         |
 | --------------- | ------------------------------------------------------------------- | ------------------------------- |
-| IMAGE_TAG       | Specify a tag of the base image.                                    | --build-arg IMAGE_TAG=centos7   |
+| IMAGE_NAME      | Specify a name of the base image.                                   | --build-arg IMAGE_TAG=ubuntu    |
+| IMAGE_TAG       | Specify a tag of the base image.                                    | --build-arg IMAGE_TAG=22.04     |
 | GIT_NAME        | Specify a username of GitHub repository.                            | --build-arg GIT_NAME=fiware-ges |
 | GIT_REV_ORION   | Specify the Orion version you want to build.                        | --build-arg GIT_REV_ORION=2.3.0 |
 | CLEAN_DEV_TOOLS | Specify whether the development tools clear. It is remained when 0. | --build-arg CLEAN_DEV_TOOLS=0   |