From 868be8214d2587b36ff4de34f5a5609a0d3a784d Mon Sep 17 00:00:00 2001 From: Robert Prehn Date: Fri, 2 Jul 2021 23:04:14 +0000 Subject: [PATCH 1/4] chore(deps): bump elixir from 1.12.1-alpine to 1.12.2-alpine Bumps elixir from 1.12.1-alpine to 1.12.2-alpine. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 87b7d607..6d190b51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM elixir:1.12.1-alpine AS elixir-builder +FROM elixir:1.12.2-alpine AS elixir-builder RUN mix local.hex --force \ && mix local.rebar --force From 0181464b1b7dbd555a5239dfca5813b074099e55 Mon Sep 17 00:00:00 2001 From: Robert Prehn <3952444+prehnRA@users.noreply.github.com> Date: Mon, 19 Jul 2021 12:44:35 -0500 Subject: [PATCH 2/4] chore: Build docker image in CI when Dockerfile changes --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 083260ee..eb5817ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,8 +41,10 @@ test_1.12.1: build_image_for_commit: stage: test image: "docker:20.10" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - changes: + - Dockerfile services: - name: docker:20.10-dind before_script: From 0bef114208023ecc63b17c7f68e485747abbf699 Mon Sep 17 00:00:00 2001 From: Robert Prehn <3952444+prehnRA@users.noreply.github.com> Date: Mon, 19 Jul 2021 12:54:28 -0500 Subject: [PATCH 3/4] fix: Only run docker build on default branch or when Dockerfile changes --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb5817ac..7e7b6d93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,9 +42,12 @@ build_image_for_commit: stage: test image: "docker:20.10" rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - - changes: + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + when: on_success + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + changes: - Dockerfile + when: on_success services: - name: docker:20.10-dind before_script: From 928691565a1b108f4fefedb8a279ada38d184cbb Mon Sep 17 00:00:00 2001 From: Robert Prehn Date: Mon, 19 Jul 2021 19:34:26 +0000 Subject: [PATCH 4/4] chore(release): 2.11.3 [skip ci] --- apps/admin/mix.exs | 2 +- apps/content/mix.exs | 2 +- apps/core/mix.exs | 2 +- infrastructure/kube.yaml | 2 +- mix.exs | 2 +- package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/admin/mix.exs b/apps/admin/mix.exs index aa19d878..5bccdaa0 100644 --- a/apps/admin/mix.exs +++ b/apps/admin/mix.exs @@ -1,7 +1,7 @@ defmodule Legendary.Admin.MixProject do use Mix.Project - @version "2.11.2" + @version "2.11.3" def project do [ diff --git a/apps/content/mix.exs b/apps/content/mix.exs index 4e93179d..303d116d 100644 --- a/apps/content/mix.exs +++ b/apps/content/mix.exs @@ -1,7 +1,7 @@ defmodule Legendary.Content.MixProject do use Mix.Project - @version "2.11.2" + @version "2.11.3" def project do [ diff --git a/apps/core/mix.exs b/apps/core/mix.exs index 01ded59a..fd0987ac 100644 --- a/apps/core/mix.exs +++ b/apps/core/mix.exs @@ -1,7 +1,7 @@ defmodule Legendary.Core.MixProject do use Mix.Project - @version "2.11.2" + @version "2.11.3" def project do [ diff --git a/infrastructure/kube.yaml b/infrastructure/kube.yaml index 3319ca66..6f64ea54 100644 --- a/infrastructure/kube.yaml +++ b/infrastructure/kube.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: app - image: registry.gitlab.com/mythic-insight/legendary:2.11.2 + image: registry.gitlab.com/mythic-insight/legendary:2.11.3 command: ["elixir"] args: - "--name" diff --git a/mix.exs b/mix.exs index ad9032fd..45ca7b24 100644 --- a/mix.exs +++ b/mix.exs @@ -1,7 +1,7 @@ defmodule Legendary.Mixfile do use Mix.Project - @version "2.11.2" + @version "2.11.3" def project do [ diff --git a/package.json b/package.json index 7898c854..74bba5a1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mythic-insight/legendary", - "version": "2.11.2", + "version": "2.11.3", "private": true, "description": "The Legendary Phoenix Boilerplate.", "main": "index.js",