Skip to content

Commit 1a22074

Browse files
authored
Merge pull request #17 from AckeeDevOps/feat/64945-helper-function-fetch
✨ Add helper function
2 parents f67d5e6 + b57bf76 commit 1a22074

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [4.0.0] - 2021-11-09
8+
### Added
9+
- `helper_functions.sh` download
10+
### Changed
11+
- Bump version of base image to 20.10.10
12+
713
## [3.4.0] - 2021-11-02
814
### Changed
915
- Bump version of Vault to 1.8.4

Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
FROM docker:19.03
1+
FROM docker:20.10.10
22

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

7+
ENV GITLAB_CI_UTILS_VERSION "2.7.0"
8+
ENV PATH "$PATH:/opt/google-cloud-sdk/bin"
9+
710
RUN apk add --no-cache bash coreutils curl jq git python3 rsync zip py3-pip gettext
811
RUN pip3 install yq
912

10-
ENV PATH "$PATH:/opt/google-cloud-sdk/bin"
1113
RUN wget -q "https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz" -O google-cloud-sdk.tar.gz && \
1214
tar -xf google-cloud-sdk.tar.gz -C /opt && \
1315
gcloud config set core/disable_usage_reporting true && \
@@ -31,3 +33,7 @@ RUN wget -q https://releases.hashicorp.com/vault/1.8.4/vault_1.8.4_linux_amd64.z
3133
rm vault.zip
3234

3335
COPY --from=docker/compose:alpine-1.27.4 /usr/local/bin/docker-compose /usr/local/bin/
36+
37+
ADD https://raw.githubusercontent.com/AckeeDevOps/gitlab-ci-utils/$GITLAB_CI_UTILS_VERSION/scripts/helper_functions.sh /usr/local/bin/helper_functions.sh
38+
39+
RUN chmod +x /usr/local/bin/helper_functions.sh

0 commit comments

Comments
 (0)