Skip to content

Dockerfiles Ubuntu Xenial -> Bionic upgrade with python 3 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arm4b merged 10 commits into from
May 8, 2020
Merged

Dockerfiles Ubuntu Xenial -> Bionic upgrade with python 3 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a6d7563
change to the bionic repos and also install gpg because the install s…
dswebbthg Jan 3, 2019
ee2798b
python3 no longer supports execfile, so switching to exec and opening…
dswebbthg Jan 3, 2019
8a32a16
only staging-unstable currently has the bionic packages
dswebbthg Jan 3, 2019
4006e86
changing the print to print() to support python3
dswebbthg Jan 3, 2019
3a337e8
adding lsb-release package so the ubuntu version is dynamically gener…
dswebbthg Jan 3, 2019
e638d95
Merge branch 'master' into bionic_upgrade
armab Apr 30, 2020
9610be3
Revert base/Dockerfile to use unstable repo
armab May 1, 2020
6d62fda
Revert st2web/Dockerfile to use unstable repo
armab May 1, 2020
18b00ec
Switch to Ubuntu:bionic for st2chatops
May 6, 2020
f9eeba3
Add gpg for st2chatops to fix Packagecloud repo add issue
May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:xenial
FROM ubuntu:bionic

ARG DEBIAN_FRONTEND=noninteractive

Expand All @@ -23,6 +23,8 @@ RUN apt-get -qq update \
&& apt-get install -y \
curl \
locales \
gpg \
lsb-release \
&& rm -rf /var/lib/apt/lists/* \
&& locale-gen en_US.UTF-8 \
&& update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
Expand Down
5 changes: 3 additions & 2 deletions base/files/.welcome.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/bin/bash

# Get st2 version based on hardcoded string in st2common
ST2_VERSION=$(/opt/stackstorm/st2/bin/python -c 'execfile("/opt/stackstorm/st2/lib/python2.7/site-packages/st2common/__init__.py"); print __version__')
printf "Welcome to \033[1;38;5;208mStackStorm HA\033[0m \033[1m%s\033[0m (Ubuntu 16.04 LTS %s %s)\n" "v${ST2_VERSION}" "$(uname -o)" "$(uname -m)"
ST2_VERSION=$(/opt/stackstorm/st2/bin/python -c 'exec(open("/opt/stackstorm/st2/lib/python3.6/site-packages/st2common/__init__.py").read()); print(__version__)')
UBUNTU_VERSION=$(lsb_release -s -d)
printf "Welcome to \033[1;38;5;208mStackStorm HA\033[0m \033[1m%s\033[0m (${UBUNTU_VERSION} %s %s)\n" "v${ST2_VERSION}" "$(uname -o)" "$(uname -m)"
printf " * Documentation: https://docs.stackstorm.com/\n"
printf " * Community: https://stackstorm.com/community-signup\n"
printf " * Forum: https://forum.stackstorm.com/\n"
Expand Down
3 changes: 2 additions & 1 deletion st2chatops/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:xenial
FROM ubuntu:bionic

ARG DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -31,6 +31,7 @@ RUN apt-get -qq update \
&& apt-get install -y \
curl \
locales \
gpg \
&& rm -rf /var/lib/apt/lists/* \
&& locale-gen en_US.UTF-8 \
&& update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
Expand Down
5 changes: 3 additions & 2 deletions st2web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:xenial
FROM ubuntu:bionic

ARG DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -29,6 +29,7 @@ RUN apt-get -qq update \
&& apt-get install -y \
curl \
locales \
gpg \
&& rm -rf /var/lib/apt/lists/* \
&& locale-gen en_US.UTF-8 \
&& update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
Expand All @@ -37,7 +38,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'

# Install nginx
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys ABF5BD827BD9BF62 \
&& echo "deb http://nginx.org/packages/ubuntu/ xenial nginx" > /etc/apt/sources.list.d/nginx.list \
&& echo "deb http://nginx.org/packages/ubuntu/ bionic nginx" > /etc/apt/sources.list.d/nginx.list \
&& apt-get update \
&& apt-get install -y nginx \
&& rm -f /etc/apt/sources.list.d/nginx.list
Expand Down