Skip to content

Commit

Permalink
Merge pull request #17 from AckeeDevOps/feat/64945-helper-function-fetch
Browse files Browse the repository at this point in the history
✨ Add helper function
  • Loading branch information
beranm14 authored Nov 22, 2021
2 parents f67d5e6 + b57bf76 commit 1a22074
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
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.0.0] - 2021-11-09
### Added
- `helper_functions.sh` download
### Changed
- Bump version of base image to 20.10.10

## [3.4.0] - 2021-11-02
### Changed
- Bump version of Vault to 1.8.4
Expand Down
10 changes: 8 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
FROM docker:19.03
FROM docker:20.10.10

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

ENV GITLAB_CI_UTILS_VERSION "2.7.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
RUN pip3 install yq

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

COPY --from=docker/compose:alpine-1.27.4 /usr/local/bin/docker-compose /usr/local/bin/

ADD https://raw.githubusercontent.com/AckeeDevOps/gitlab-ci-utils/$GITLAB_CI_UTILS_VERSION/scripts/helper_functions.sh /usr/local/bin/helper_functions.sh

RUN chmod +x /usr/local/bin/helper_functions.sh

0 comments on commit 1a22074

Please sign in to comment.