Update packer and ansible version
This commit is contained in:
parent
aedcc9d9bc
commit
564a2c48d2
2 changed files with 12 additions and 3 deletions
11
Makefile
11
Makefile
|
|
@ -1,4 +1,5 @@
|
|||
PACKER_VERSION ?= 1.4.3
|
||||
PACKER_VERSION ?= 1.5.1
|
||||
ANSIBLE_VERSION ?= 2.9.2
|
||||
ANNOUNCE ?= http://10.2.2.1:6969/announce
|
||||
WEBSEED ?= http://10.2.2.1
|
||||
|
||||
|
|
@ -44,7 +45,13 @@ clean:
|
|||
|
||||
.PHONY: builderimg
|
||||
builderimg:
|
||||
docker build --pull -t "$(DOCKER_IMAGE_BUILDER)" --cache-from "$(DOCKER_IMAGE_BUILDER)" --build-arg "PACKER_VERSION=$(PACKER_VERSION)" builder
|
||||
docker build \
|
||||
--pull \
|
||||
-t "$(DOCKER_IMAGE_BUILDER)" \
|
||||
--cache-from "$(DOCKER_IMAGE_BUILDER)" \
|
||||
--build-arg "PACKER_VERSION=$(PACKER_VERSION)" \
|
||||
--build-arg "ANSIBLE_VERSION=$(ANSIBLE_VERSION)" \
|
||||
builder
|
||||
|
||||
.PHONY: secscanimg
|
||||
secscanimg:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
FROM docker
|
||||
|
||||
ARG ANSIBLE_VERSION
|
||||
|
||||
RUN apk add --no-cache \
|
||||
ca-certificates \
|
||||
coreutils \
|
||||
|
|
@ -19,7 +21,7 @@ RUN apk add --no-cache \
|
|||
openssl-dev \
|
||||
python3-dev \
|
||||
&& pip3 install --upgrade pip \
|
||||
&& pip3 install ansible==2.8.0 \
|
||||
&& pip3 install ansible=="$ANSIBLE_VERSION" \
|
||||
&& apk del .build-deps
|
||||
|
||||
ARG PACKER_VERSION
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue