Updates base to Ubuntu 20.04
Updates python to 3.8
Updates pip dependencies to more recent versions
Adds apt cache to stage 2 dockerfile
Fixes bug 1844
Change-Id: Iccea9a5121fa8e701ae18c64d71d094ee7c535c7
Signed-off-by: beierlm <mark.beierl@canonical.com>
# devops-stages/stage-build.sh
#
# devops-stages/stage-build.sh
#
+FROM ubuntu:20.04
+
+ARG APT_PROXY
+RUN if [ ! -z $APT_PROXY ] ; then \
+ echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
+ echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\
+ fi
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
debhelper \
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
debhelper \
-RUN python3 -m easy_install pip==21.0.1
-RUN pip3 install tox==3.22.0
+RUN python3 -m easy_install pip==21.3.1
+RUN pip install tox==3.24.5
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget build-essential dh-make \
openjdk-8-jdk maven
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget build-essential dh-make \
openjdk-8-jdk maven
# limitations under the License.
stdeb
# limitations under the License.
stdeb
-setuptools-version-command
\ No newline at end of file
+setuptools-version-command
+setuptools<60
\ No newline at end of file
-setuptools-version-command==2.2
- # via -r requirements-dist.in
-stdeb==0.10.0
- # via -r requirements-dist.in
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
#######################################################################################
# Copyright ETSI Contributors and Others.
#
#######################################################################################
# Copyright ETSI Contributors and Others.
#
# See the License for the specific language governing permissions and
# limitations under the License.
#######################################################################################
# See the License for the specific language governing permissions and
# limitations under the License.
#######################################################################################
+setuptools-version-command==99.9
+ # via -r requirements-dist.in
+stdeb==0.10.0
+ # via -r requirements-dist.in
+
+# The following packages are considered to be unsafe in a requirements file:
+setuptools==59.8.0
+ # via
+ # -r requirements-dist.in
+ # setuptools-version-command
-coverage==5.5
- # via
- # -r requirements-test.in
- # nose2
-nose2==0.10.0
- # via -r requirements-test.in
-six==1.15.0
- # via nose2
#######################################################################################
# Copyright ETSI Contributors and Others.
#
#######################################################################################
# Copyright ETSI Contributors and Others.
#
# See the License for the specific language governing permissions and
# limitations under the License.
#######################################################################################
# See the License for the specific language governing permissions and
# limitations under the License.
#######################################################################################
+coverage==6.2
+ # via
+ # -r requirements-test.in
+ # nose2
+nose2==0.10.0
+ # via -r requirements-test.in
+six==1.16.0
+ # via nose2
-pyyaml
\ No newline at end of file
+pyyaml==5.4.1
\ No newline at end of file
-bitarray==1.8.1
- # via pyangbind
-enum34==1.1.10
- # via pyangbind
-lxml==4.6.3
- # via
- # pyang
- # pyangbind
-pyang==2.4.0
- # via
- # -r requirements.in
- # pyangbind
-pyangbind==0.8.1
- # via -r requirements.in
-pyyaml==5.4.1
- # via -r requirements.in
-regex==2021.3.17
- # via pyangbind
-six==1.15.0
- # via pyangbind
#######################################################################################
# Copyright ETSI Contributors and Others.
#
#######################################################################################
# Copyright ETSI Contributors and Others.
#
# See the License for the specific language governing permissions and
# limitations under the License.
#######################################################################################
# See the License for the specific language governing permissions and
# limitations under the License.
#######################################################################################
+bitarray==2.3.5
+ # via pyangbind
+enum34==1.1.10
+ # via pyangbind
+lxml==4.7.1
+ # via
+ # pyang
+ # pyangbind
+pyang==2.5.2
+ # via
+ # -r requirements.in
+ # pyangbind
+pyangbind==0.8.1
+ # via -r requirements.in
+pyyaml==5.4.1
+ # via -r requirements.in
+regex==2021.11.10
+ # via pyangbind
+six==1.16.0
+ # via pyangbind
[testenv]
usedevelop = True
[testenv]
usedevelop = True
setenv = VIRTUAL_ENV={envdir}
PYTHONDONTWRITEBYTECODE = 1
passenv = HOME
setenv = VIRTUAL_ENV={envdir}
PYTHONDONTWRITEBYTECODE = 1
passenv = HOME
#######################################################################################
[testenv:pip-compile]
#######################################################################################
[testenv:pip-compile]
+deps = pip-tools==6.4.0
+skip_install = true
+whitelist_externals = bash
+ [
- - sh -c 'for file in requirements*.in ; do pip-compile -rU --no-header $file ;\
- out=`echo $file | sed "s/.in/.txt/"` ; \
- head -16 tox.ini >> $out ;\
- done'
-whitelist_externals = sh
+ - bash -c "for file in requirements*.in ; do \
+ UNSAFE="" ; \
+ if [[ $file =~ 'dist' ]] ; then UNSAFE='--allow-unsafe' ; fi ; \
+ pip-compile -rU --no-header $UNSAFE $file ;\
+ out=`echo $file | sed 's/.in/.txt/'` ; \
+ sed -i -e '1 e head -16 tox.ini' $out ;\
+ done"
#######################################################################################
#######################################################################################