Skip to content
This repository has been archived by the owner on Jul 4, 2024. It is now read-only.

Commit

Permalink
Removing ENTRYPOINT
Browse files Browse the repository at this point in the history
  • Loading branch information
Marek Sierociński committed Mar 28, 2020
1 parent 3f173e2 commit 0b3302a
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 53 deletions.
31 changes: 12 additions & 19 deletions Dockerfile.bionic
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
FROM ubuntu:bionic

LABEL vendor="Bitbar Inc" \
description="Ubuntu LTS based Docker image with Python"
description="Ubuntu LTS based Docker image with Python" \
maintainer="Marek Sierociński <marek.sierocinski@bitbar.com>"

ENV TERM=xterm-256color \
PATH="$PATH:/usr/local/bin"
Expand All @@ -14,33 +15,25 @@ ENV TZ=Etc/UTC
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

# installing apt packages
RUN apt-get update
RUN apt-get dist-upgrade -y
RUN apt-get install -qy -o APT::Install-Recommend=false -o APT::Install-Suggests=false \
apt-transport-https \
apt-utils \
RUN apt-get update && apt-get dist-upgrade -y && apt-get install -qy \
-o APT::Install-Recommend=false \
-o APT::Install-Suggests=false \
sudo \
bash \
aptitude apt-transport-https apt-utils \
ca-certificates \
iproute2 \
tree \
git \
curl \
wget \
tzdata

# install Python
RUN apt-get update && apt-get dist-upgrade -y
RUN apt-get update && apt-get install -qy -o APT::Install-Recommend=false -o APT::Install-Suggests=false \
python python-pip python-dev \
python3 python3-pip python3-dev

# confd
ADD https://github.com/kelseyhightower/confd/releases/download/v0.16.0/confd-0.16.0-linux-amd64 /usr/local/bin/confd
RUN chmod +x /usr/local/bin/confd

# entrypoint
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
RUN chmod +x /usr/local/bin/entrypoint.sh
RUN apt-get install -qy -o APT::Install-Recommend=false -o APT::Install-Suggests=false \
python python-pip python-dev python-apt \
python3 python3-pip python3-dev python3-apt

ENTRYPOINT ["entrypoint.sh"]
CMD ["bash"]

ENV SHELL /bin/bash
31 changes: 12 additions & 19 deletions Dockerfile.xenial
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
FROM ubuntu:xenial

LABEL vendor="Bitbar Inc" \
description="Ubuntu LTS based Docker image with Python"
description="Ubuntu LTS based Docker image with Python" \
maintainer="Marek Sierociński <marek.sierocinski@bitbar.com>"

ENV TERM=xterm-256color \
PATH="$PATH:/usr/local/bin"
Expand All @@ -14,33 +15,25 @@ ENV TZ=Etc/UTC
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

# installing apt packages
RUN apt-get update
RUN apt-get dist-upgrade -y
RUN apt-get install -qy -o APT::Install-Recommend=false -o APT::Install-Suggests=false \
apt-transport-https \
apt-utils \
RUN apt-get update && apt-get dist-upgrade -y && apt-get install -qy \
-o APT::Install-Recommend=false \
-o APT::Install-Suggests=false \
sudo \
bash \
aptitude apt-transport-https apt-utils \
ca-certificates \
iproute2 \
tree \
git \
curl \
wget \
tzdata

# install Python
RUN apt-get update && apt-get dist-upgrade -y
RUN apt-get update && apt-get install -qy -o APT::Install-Recommend=false -o APT::Install-Suggests=false \
python python-pip python-dev \
python3 python3-pip python3-dev

# confd
ADD https://github.com/kelseyhightower/confd/releases/download/v0.16.0/confd-0.16.0-linux-amd64 /usr/local/bin/confd
RUN chmod +x /usr/local/bin/confd

# entrypoint
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
RUN chmod +x /usr/local/bin/entrypoint.sh
RUN apt-get install -qy -o APT::Install-Recommend=false -o APT::Install-Suggests=false \
python python-pip python-dev python-apt \
python3 python3-pip python3-dev python3-apt

ENTRYPOINT ["entrypoint.sh"]
CMD ["bash"]

ENV SHELL /bin/bash
48 changes: 35 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,44 @@ platforms:
## Info
* Based on Ubuntu LTS (18.04)
* Python 2.7 and 3:
* Based on Ubuntu LTS
* Installed python packages:
* Python 2.7
* `python`
* `python-pip`
* `python-dev`
* `python-apt`

* Python 3.6

* `python3`
* `python3-pip`
* `python3-dev`
* `python3-apt`

* Other installed packages:

* `sudo`
* `bash`
* `ca-certificates`
* `aptitude`
* `apt-transport-https`
* `apt-utils`
* `iproute2`
* `ca-certificates`
* `tree`
* `git`
* `curl`
* `wget`
* `tzdata`

* pip
* dev
* [confd](https://github.com/kelseyhightower/confd) onboard
* other tools:
## Changelog

* curl
* wget
* git
* gcc
* tree
* **1.1.1**

## Changelog
* Removing `ENTRYPOINT` as Ansible Molecule wasn't working with it

* **1.1.0**

Expand Down
2 changes: 0 additions & 2 deletions entrypoint.sh

This file was deleted.

0 comments on commit 0b3302a

Please sign in to comment.