Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [4.1.0] - 2022-08-29
### Changed
- Bump version of base image to 20.10.17
- Bump version of CI utils to 2.13.0 - adds support for Artifact Registry to helper functions
- Bump version of Vault to 1.11.2

## [4.0.0] - 2021-11-09
### Added
- `helper_functions.sh` download
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM docker:20.10.16
FROM docker:20.10.17

LABEL tag="ackee-gitlab" \
author="Ackee 🦄" \
description="Tailor-made image for our stack"

ENV GITLAB_CI_UTILS_VERSION "2.7.0"
ENV GITLAB_CI_UTILS_VERSION "2.13.0"
ENV PATH "$PATH:/opt/google-cloud-sdk/bin"

RUN apk add --no-cache bash coreutils curl jq git python3 rsync zip py3-pip gettext
Expand All @@ -26,7 +26,7 @@ RUN wget -q https://get.helm.sh/helm-v3.5.3-linux-amd64.tar.gz -O helm.tar.gz &&
mv linux-amd64/helm /usr/local/bin/helm && \
rm -r linux-amd64

RUN wget -q https://releases.hashicorp.com/vault/1.8.4/vault_1.8.4_linux_amd64.zip -O vault.zip && \
RUN wget -q https://releases.hashicorp.com/vault/1.11.2/vault_1.11.2_linux_amd64.zip -O vault.zip && \
unzip vault.zip && \
mv vault /usr/local/bin/vault && \
chmod +x /usr/local/bin/vault && \
Expand Down