From d23a46ca8a2b1f54fc0132ddfdea63db6048bf2f Mon Sep 17 00:00:00 2001 From: Wassim DHIF Date: Mon, 10 Oct 2022 22:15:07 +0200 Subject: [PATCH 1/2] [action] Upgrade to Ruby 2.7.6 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4b77b68..a9c9d85 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 with: - ruby-version: '2.6' + ruby-version: '2.7.6' bundler-cache: true - run: bundle exec rspec docker: From 5ee8e1319746878c99a07008bc710419c4fd77d9 Mon Sep 17 00:00:00 2001 From: Wassim DHIF Date: Mon, 10 Oct 2022 22:22:51 +0200 Subject: [PATCH 2/2] [docker] Update image to Bullseye --- Dockerfile | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index ffcf5c6..633b205 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,25 +1,7 @@ -# Copyright (c) 2017 rockyluke -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +FROM debian:bullseye -FROM debian:jessie - -ENV DEBIAN_FRONTEND=noninteractive \ - TZ=Europe/Amsterdam - -RUN apt-get update -qq && \ - apt-get upgrade -qq -y && \ - apt-get install -qq -y \ +RUN apt-get update && \ + apt-get install --no-install-recommends -y \ build-essential \ bundler \ git-core \ @@ -29,13 +11,10 @@ RUN apt-get update -qq && \ apt-get autoclean && \ apt-get autoremove -RUN git clone https://github.com/wdhif/gitlabci-cli.git /usr/src && \ - cd /usr/src && \ - bundle install - +RUN git clone https://github.com/wdhif/gitlabci-cli.git /usr/src WORKDIR /usr/src +RUN bundle install ENTRYPOINT [ "bundle", "exec", "gitlabci-cli" ] CMD [ "help" ] -# EOF