Commit 19fd10f4 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch '1-update-default-image' into 'master' 

Resolve "Update default image"

Closes #1

See merge request to-be-continuous/make!10
parents a30d9038 2b6d4974

README.md

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ The GNU Make template uses some global configuration used throughout all jobs. 


| Name                  | description                            | default value     |

| --------------------- | -------------------------------------- | ----------------- |

| `MAKE_IMAGE`          | The Docker image used to run GNU Make<br/>:warning: **set the image required by your project** (see next chapter)  | `registry.hub.docker.com/alpine/make` |

| `MAKE_IMAGE`          | The Docker image used to run GNU Make<br/>:warning: **set the image required by your project** (see next chapter)  | `registry.hub.docker.com/alpinelinux/build-base` |



### Which image?

kicker.json

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    {

      "name": "MAKE_IMAGE",

      "description": "The Docker image used to run GNU Make - **set the image required by your project** (see doc)",

      "default": "registry.hub.docker.com/alpine/make"

      "default": "registry.hub.docker.com/alpinelinux/build-base"

    },

    {

      "name": "MAKE_BUILD_ARGS",

templates/gitlab-ci-make.yml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ variables: 
  TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"



  # Default Docker image (use a public image - can be overridden)

  MAKE_IMAGE: "registry.hub.docker.com/alpine/make"

  MAKE_IMAGE: "registry.hub.docker.com/alpinelinux/build-base"



  # Default arguments for 'build' command

  MAKE_BUILD_ARGS: "all test"