Skip to content

Commit

Permalink
Merge pull request #54 from jstaph/ubuntu_20
Browse files Browse the repository at this point in the history
python3.8 / Ubuntu Focal migration
  • Loading branch information
arm4b authored Feb 12, 2022
2 parents 84036d3 + daabd54 commit 1dac04d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal

ARG DEBIAN_FRONTEND=noninteractive

Expand Down
2 changes: 1 addition & 1 deletion base/files/.welcome.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Get st2 version based on hardcoded string in st2common
ST2_VERSION=$(/opt/stackstorm/st2/bin/python -c 'exec(open("/opt/stackstorm/st2/lib/python3.6/site-packages/st2common/__init__.py").read()); print(__version__)')
ST2_VERSION=$(/opt/stackstorm/st2/bin/python -c 'exec(open("/opt/stackstorm/st2/lib/python3.8/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"
Expand Down
2 changes: 1 addition & 1 deletion st2chatops/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal

ARG DEBIAN_FRONTEND=noninteractive

Expand Down
4 changes: 2 additions & 2 deletions st2web/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal

ARG DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -38,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/ bionic nginx" > /etc/apt/sources.list.d/nginx.list \
&& echo "deb http://nginx.org/packages/ubuntu/ focal 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

0 comments on commit 1dac04d

Please sign in to comment.