Skip to content

Commit

Permalink
Update CLI image to use python:3.7 base. Bump version string in image…
Browse files Browse the repository at this point in the history
… ENV
  • Loading branch information
mwvaughn committed Apr 23, 2021
1 parent 54c5325 commit 9f758ac
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
21 changes: 10 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu
FROM python:3.7

ARG CLI_VERSION=latest
ARG CLI_BRANCH=main
Expand Down Expand Up @@ -33,21 +33,20 @@ RUN curl -L -sk -o /usr/local/bin/jq "https://github.com/stedolan/jq/releases/do
&& chmod a+x /usr/local/bin/jq

# Python 3
RUN apt-get -y update && \
apt-get -y install --no-install-recommends \
python3 \
python3-dev \
python3-pip \
python3-setuptools && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
# RUN apt-get -y update && \
# apt-get -y install --no-install-recommends \
# python3 \
# python3-dev \
# python3-pip \
# python3-setuptools && \
# apt-get clean && \
# rm -rf /var/lib/apt/lists/*

# Make python3 the default user python
RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
# RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
RUN pip3 install --quiet --upgrade pip==${PYTHON_PIP_VERSION}
RUN pip3 install --quiet --upgrade virtualenv==${PYTHON_VIRTUALENV_VERSION}


RUN mkdir -p /home
RUN mkdir -p /work
RUN mkdir -p /install
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")

CLI_BRANCH ?= $(GIT_BRANCH)
CLI_VERSION ?= "1.0.0"
CLI_VERSION ?= "1.0.4"
IMAGE_BASENAME := tapis-cli
DOCKER_ORG ?= tacc
PUBLIC_DOCKER_IMAGE ?= $(DOCKER_ORG)/$(IMAGE_BASENAME):latest
Expand Down

0 comments on commit 9f758ac

Please sign in to comment.