Skip to content

Commit

Permalink
Switch to latest Ubuntu version (20.04) as base image (#5)
Browse files Browse the repository at this point in the history
* Switch to latest Ubuntu version (20.04) as base image
  • Loading branch information
dirkaholic authored Jun 17, 2020
1 parent 7326579 commit 89947d7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .docker/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/ash
#!/bin/bash

set -e

Expand All @@ -8,4 +8,4 @@ if test -f /tmp/.ansible-project-init-env; then
. /tmp/.ansible-project-init-env
fi

ash -c "$*"
bash -c "$*"
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
FROM alpine:3.10.3
FROM ubuntu:20.04

LABEL MAINTAINER=<ops@newsletter2go.com>

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
Expand All @@ -35,4 +35,4 @@ WORKDIR /ansible

ENTRYPOINT ["/docker-entrypoint.sh"]

CMD ["/bin/ash"]
CMD ["/bin/bash"]
2 changes: 1 addition & 1 deletion dist/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 89947d7

Please sign in to comment.