[riot-commits] [RIOT-OS/RIOT] e83966: makefiles/docker.inc.mk: allow setting DOCKER_ENV_...

Juan I Carrano noreply at github.com
Tue Aug 20 16:50:48 CEST 2019


  Branch: refs/heads/master
  Home:   https://github.com/RIOT-OS/RIOT
  Commit: e83966c80fd78ccb8d9d42f476cb24d3b9997e99
      https://github.com/RIOT-OS/RIOT/commit/e83966c80fd78ccb8d9d42f476cb24d3b9997e99
  Author: Gaëtan Harter <gaetan.harter at fu-berlin.de>
  Date:   2019-08-19 (Mon, 19 Aug 2019)

  Changed paths:
    M makefiles/docker.inc.mk

  Log Message:
  -----------
  makefiles/docker.inc.mk: allow setting DOCKER_ENV_VARS from environment

This allows setting other variables that should be exported to the
docker build.

As for other variables, they must still be unmodified before parsing
`docker.inc.mk` to be exported.


  Commit: 8b90a515242dcfdeac288a4443dc656c09445797
      https://github.com/RIOT-OS/RIOT/commit/8b90a515242dcfdeac288a4443dc656c09445797
  Author: Gaëtan Harter <gaetan.harter at fu-berlin.de>
  Date:   2019-08-19 (Mon, 19 Aug 2019)

  Changed paths:
    M makefiles/docker.inc.mk

  Log Message:
  -----------
  makefiles/docker.inc.mk: allow adding to docker ENV and OVERRIDE args

This allows passing other arguments as environment variables in
DOCKER_ENVIRONMENT_CMDLINE and as command line override in
DOCKER_OVERRIDE_CMDLINE without using the automatic detection.

This will allow passing USEMODULE to docker as its value is usually set
in an application Makefile so has its origin changed.


  Commit: 89a92c551f4e0bccb187fc1c0a1a18d87e3d676c
      https://github.com/RIOT-OS/RIOT/commit/89a92c551f4e0bccb187fc1c0a1a18d87e3d676c
  Author: Gaëtan Harter <gaetan.harter at fu-berlin.de>
  Date:   2019-08-19 (Mon, 19 Aug 2019)

  Changed paths:
    M makefiles/docker.inc.mk

  Log Message:
  -----------
  makefiles/docker.inc.mk: allow adding docker make arguments

Allow defining make arguments when called in docker.

It would be the same as adding to `DOCKER_OVERRIDE_CMDLINE` but have a
consistent naming.


  Commit: f08e0d315e248e75bbb697c3edbd24ed2e0281ac
      https://github.com/RIOT-OS/RIOT/commit/f08e0d315e248e75bbb697c3edbd24ed2e0281ac
  Author: Juan I Carrano <j.carrano at fu-berlin.de>
  Date:   2019-08-20 (Tue, 20 Aug 2019)

  Changed paths:
    M makefiles/docker.inc.mk

  Log Message:
  -----------
  Merge pull request #12030 from cladmi/pr/docker/allow_defining_from_env

makefiles/docker.inc.mk: allow setting more things from environment


Compare: https://github.com/RIOT-OS/RIOT/compare/fa81295988d9...f08e0d315e24


More information about the commits mailing list