Skip to content

Commit f0eee78

Browse files
committed
Add simplification of docker commands
1 parent b2783b4 commit f0eee78

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

Dockerfile.qa

+12-11
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,47 @@ ARG PYTHON_VERSION
55

66
# Install add-apt-repository
77
RUN apt-get update
8-
RUN apt-get install -y software-properties-common
8+
RUN apt install -y software-properties-common
99

1010
# Add python repo
1111
RUN add-apt-repository ppa:deadsnakes/ppa
1212
RUN apt-get update
1313

1414
# Install apt-utils
15-
RUN apt-get install -y apt-utils
15+
RUN apt install -y apt-utils
1616

1717
# install setuptools
1818
RUN if [ $PYTHON_VERSION = '2.7' ] ; then \
19-
apt-get install -y python-setuptools -reinstall ;\
19+
apt install -y python-setuptools -reinstall ;\
2020
else \
21-
apt-get install -y python3-setuptools ;\
21+
apt install -y python3-setuptools ;\
2222
fi
2323

2424
# Install python development
25-
RUN apt-get install -y \
25+
RUN apt install -y \
2626
python$PYTHON_VERSION-dev \
2727
python3-pip
2828

2929
# install distutils.util
3030
RUN if [ $PYTHON_VERSION = '3.7' ] ; then \
31-
apt-get install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ;\
31+
apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ;\
3232
elif [ $PYTHON_VERSION = '3.6' ] ; then \
33-
apt-get install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ;\
33+
apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ;\
3434
elif [ $PYTHON_VERSION = '3.10' ] ; then \
35-
apt-get install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ; \
35+
apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ; \
3636
curl -sS https://bootstrap.pypa.io/get-pip.py | python$PYTHON_VERSION ; \
3737
elif [ $PYTHON_VERSION = '3.11' ] ; then \
38-
apt-get install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ; \
38+
apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ; \
3939
curl -sS https://bootstrap.pypa.io/get-pip.py | python$PYTHON_VERSION ; \
4040
else \
41-
apt-get install -y python3-distutils python3-distutils-extra python3-apt --reinstall ; \
41+
apt install -y python3-distutils python3-distutils-extra python3-apt --reinstall ; \
4242
fi
4343

4444
# Register the version in alternatives
4545
RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python$PYTHON_VERSION 1
4646

4747
# Install kerberos development
48-
RUN apt-get install -y libkrb5-dev
48+
RUN apt install -y libkrb5-dev
4949

5050
# Clean
5151
RUN apt-get clean
@@ -55,6 +55,7 @@ WORKDIR /atlassian-python-api
5555
COPY requirements.txt .
5656
COPY requirements-dev.txt .
5757
RUN python3 -m pip install --no-cache-dir --upgrade pip
58+
RUN python3 -m pip install --no-cache-dir --upgrade wheel
5859
RUN python3 -m pip install --no-cache-dir -r requirements-dev.txt
5960

6061
ENV PYTHON_VERSION=$PYTHON_VERSION

Dockerfile.standalone

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN echo "deb https://packages.atlassian.com/debian/atlassian-sdk-deb/ stable co
99
&& apt-get update
1010

1111
# Install Atlassian plugin SDK
12-
RUN apt-get install -y atlassian-plugin-sdk
12+
RUN apt install -y atlassian-plugin-sdk
1313

1414
# Clean
1515
RUN apt-get clean

atlassian/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.39.0
1+
3.40.0

0 commit comments

Comments
 (0)