From d9c0ef5c8768810c819315333d1d5b5ab01decd4 Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Fri, 29 May 2020 20:35:24 +0000 Subject: [PATCH] install client for hashicorp vault --- .gitlab-ci.yml | 2 ++ Dockerfile | 1 + Makefile | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 136c6fa..dcdf6c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,7 @@ test:docker-image-build: extends: .docker-build-setup script: - *install-make + - export IMAGE_DATE=$(date -Iseconds) - make image only: refs: @@ -69,6 +70,7 @@ publish:docker-image: - docker logout ${CI_REGISTRY} script: - *install-make + - export IMAGE_DATE=$(date -Iseconds) - make publish only: - /^v[0-9]+(.[0-9]+){2}$/ diff --git a/Dockerfile b/Dockerfile index cf355f9..9138cd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,6 +42,7 @@ RUN \ && \ pip install \ ansible==${ANSIBLE_VERSION} \ + hvac==0.10.3 \ && \ apk del \ .build-deps \ diff --git a/Makefile b/Makefile index 393b639..26727ea 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ PLAYBOOK_FILE ?= "playbook.yml" DOCKERFILE = Dockerfile IMAGE_NAME ?= pleroma-ansible-playbook IMAGE_TAG ?= latest -IMAGE_DATE := $(shell date --iso-8601=seconds) +IMAGE_DATE ?= nil DOCKER_IMAGE = $(IMAGE_NAME):$(IMAGE_TAG) PHONY: secret_key_base signing_salt vapid_private_key vapid_public_key test_modules_unit image publish pleroma