From 89947d7c5969598af094572f319396fce662a738 Mon Sep 17 00:00:00 2001 From: Dirk Pahl Date: Wed, 17 Jun 2020 17:28:33 +0200 Subject: [PATCH] Switch to latest Ubuntu version (20.04) as base image (#5) * Switch to latest Ubuntu version (20.04) as base image --- .docker/docker-entrypoint.sh | 4 ++-- Dockerfile | 16 ++++++++-------- dist/docker-compose.yml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.docker/docker-entrypoint.sh b/.docker/docker-entrypoint.sh index b74b775..963cfba 100755 --- a/.docker/docker-entrypoint.sh +++ b/.docker/docker-entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/ash +#!/bin/bash set -e @@ -8,4 +8,4 @@ if test -f /tmp/.ansible-project-init-env; then . /tmp/.ansible-project-init-env fi -ash -c "$*" +bash -c "$*" diff --git a/Dockerfile b/Dockerfile index 201b88b..5670927 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,22 @@ -FROM alpine:3.10.3 +FROM ubuntu:20.04 LABEL MAINTAINER= ARG ANSIBLE_VERSION=2.8.* -RUN apk --update --no-cache add \ +RUN apt update && apt -y install \ sudo \ + wget \ openssl \ ca-certificates \ openssh-client \ python3 \ - && apk --no-cache --virtual build-dependencies add \ python3-dev \ + python3-pip \ libffi-dev \ - openssl-dev \ - build-base \ - && pip3 install ansible==$ANSIBLE_VERSION \ - && apk del build-dependencies + libssl-dev \ + build-essential \ + && pip3 install ansible==$ANSIBLE_VERSION RUN ln -fsn /usr/bin/python3 /usr/bin/python RUN ln -fsn /usr/bin/pip3 /usr/bin/pip @@ -35,4 +35,4 @@ WORKDIR /ansible ENTRYPOINT ["/docker-entrypoint.sh"] -CMD ["/bin/ash"] +CMD ["/bin/bash"] diff --git a/dist/docker-compose.yml b/dist/docker-compose.yml index 693a7b6..f2d1abd 100644 --- a/dist/docker-compose.yml +++ b/dist/docker-compose.yml @@ -7,5 +7,5 @@ services: volumes: - .:/ansible - $HOME$USERPROFILE/.ssh:/tmp/.ssh - - $HOME$USERPROFILE/.docker_ansible_history:/root/.ash_history + - $HOME$USERPROFILE/.docker_ansible_history:/root/.bash_history - ./.cache/root/.ansible/roles:/root/.ansible/roles