Add Ubuntu 20.04 image

Author: khos2ow

.circleci/config.yml

@@ -54,6 +54,13 @@ jobs:
       TAG: ubuntu1804
       PARAMS: ""
 
+  ubuntu2004:
+    <<: *defaults
+    environment:
+      IMAGE: khos2ow/cloudstack-deb-builder
+      TAG: ubuntu2004
+      PARAMS: ""
+
   latest:
     <<: *defaults
     environment:
@@ -80,6 +87,11 @@ workflows:
           tags:
             only: /v.*/
 
+    - ubuntu2004:
+        filters:
+          tags:
+            only: /v.*/
+
     - latest:
         filters:
           tags:

Makefile

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-.PHONY: all ubuntu1404 ubuntu1604 ubuntu1804 latest
+.PHONY: all ubuntu1404 ubuntu1604 ubuntu1804 ubuntu2004 latest
 
 # Build docker tag based on provided info
 #
@@ -25,7 +25,7 @@ define build_tag
 	docker build -t khos2ow/cloudstack-deb-builder:$(1) $(2)
 endef
 
-all: ubuntu1404 ubuntu1604 ubuntu1804 latest
+all: ubuntu1404 ubuntu1604 ubuntu1804 ubuntu2004 latest
 
 ubuntu1404:
 	$(call build_tag,ubuntu1404,ubuntu1404)
@@ -36,5 +36,8 @@ ubuntu1604:
 ubuntu1804:
 	$(call build_tag,ubuntu1804,ubuntu1804)
 
+ubuntu2004:
+	$(call build_tag,ubuntu2004,ubuntu2004)
+
 latest:
-	$(call build_tag,latest,ubuntu1804)
+	$(call build_tag,latest,ubuntu2004)

README.md

@@ -28,7 +28,8 @@ This will give portable, immutable and reproducable mechanism to build packages
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`latest`, `ubuntu1804` (ubuntu1804/Dockerfile)](https://github.com/khos2ow/cloudstack-deb-builder/blob/master/ubuntu1804/Dockerfile)
+- [`latest`, `ubuntu2004` (ubuntu2004/Dockerfile)](https://github.com/khos2ow/cloudstack-deb-builder/blob/master/ubuntu2004/Dockerfile)
+- [`ubuntu1804` (ubuntu1804/Dockerfile)](https://github.com/khos2ow/cloudstack-deb-builder/blob/master/ubuntu1804/Dockerfile)
 - [`ubuntu1604` (ubuntu1604/Dockerfile)](https://github.com/khos2ow/cloudstack-deb-builder/blob/master/ubuntu1604/Dockerfile)
 - [`ubuntu1404` (ubuntu1404/Dockerfile)](https://github.com/khos2ow/cloudstack-deb-builder/blob/master/ubuntu1404/Dockerfile)
 
@@ -56,11 +57,11 @@ Building DEB packages with the Docker container is rather easy, a few steps are
 
 ### Pull Docker images
 
-Let's assume we want to build packages for Ubuntu 16.04 (Xenial). We pull that image first:
+Let's assume we want to build packages for Ubuntu 20.04 (Focal). We pull that image first:
 
-    docker pull khos2ow/cloudstack-deb-builder:ubuntu1604
+    docker pull khos2ow/cloudstack-deb-builder:ubuntu2004
 
-You can replace `ubuntu1604` tag by `ubuntu1804`, `ubuntu1404` or `latest` if you want.
+You can replace `ubuntu2004` tag by `ubuntu1804`, `ubuntu1604`, `ubuntu1404` or `latest` if you want.
 
 ### Build local repository
 
@@ -80,13 +81,13 @@ Now that we have cloned the CloudStack source code locally, we can build package
 
     docker run \
         -v /tmp:/mnt/build \
-        khos2ow/cloudstack-deb-builder:ubuntu1604 [ARGS...]
+        khos2ow/cloudstack-deb-builder:ubuntu2004 [ARGS...]
 
 Or if your local cloudstack folder has other name, you need to map it to `/mnt/build/cloudstack`.
 
     docker run \
         -v /tmp/cloudstack-custom-name:/mnt/build/cloudstack \
-        khos2ow/cloudstack-deb-builder:ubuntu1604 [ARGS...]
+        khos2ow/cloudstack-deb-builder:ubuntu2004 [ARGS...]
 
 After the build has finished the *.deb* packages are available in */tmp/cloudstack/dist/debbuild/DEBS* on the host system.
 
@@ -100,7 +101,7 @@ Now let's assume we want to build packages of `HEAD` of `master` branch from htt
 
     docker run \
         -v /tmp:/mnt/build \
-        khos2ow/cloudstack-deb-builder:ubuntu1604 \
+        khos2ow/cloudstack-deb-builder:ubuntu2004 \
             --git-remote https://github.com/apache/cloudstack.git \
             --git-ref master \
             [ARGS...]
@@ -126,7 +127,7 @@ You can provide Maven cache folder (`~/.m2`) as a volume to the container to mak
     docker run \
         -v /tmp:/mnt/build \
         -v ~/.m2:/root/.m2 \
-        khos2ow/cloudstack-deb-builder:ubuntu1604 [ARGS...]
+        khos2ow/cloudstack-deb-builder:ubuntu2004 [ARGS...]
 
 ### Adjust host owner permission
 
@@ -138,15 +139,15 @@ This is specially useful if you want to use this image in Jenkins job and want t
         -v /tmp:/mnt/build \
         -e "USER_ID=$(id -u)" \
         -e "USER_GID=$(id -g)" \
-        khos2ow/cloudstack-deb-builder:ubuntu1604 [ARGS...]
+        khos2ow/cloudstack-deb-builder:ubuntu2004 [ARGS...]
 
 ## Builder help
 
 To see all the available options you can pass to `docker run ...` command:
 
     docker run \
         -v /tmp:/mnt/build \
-        khos2ow/cloudstack-deb-builder:ubuntu1604 --help
+        khos2ow/cloudstack-deb-builder:ubuntu2004 --help
 
 ## License
 

ubuntu2004/Dockerfile

@@ -0,0 +1,52 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM ubuntu:20.04
+LABEL maintainer="Khosrow Moossavi <[email protected]> (@khos2ow)"
+
+RUN apt-get update -y && \
+    apt-get install -y --no-install-recommends \
+        make \
+        locate \
+        tar \
+        lsb-release \
+        build-essential \
+        dpkg-dev \
+        devscripts \
+        debhelper \
+        genisoimage \
+        git \
+        maven \
+        openjdk-8-jdk \
+        python \
+        python-mysqldb \
+        python-mysql.connector \
+        dh-systemd \
+        python-setuptools && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* && \
+    update-java-alternatives -s java-1.8.0-openjdk-amd64
+
+ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
+
+VOLUME /mnt/build
+WORKDIR /mnt/build
+
+COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY environment-info.sh /usr/local/bin/environment-info.sh
+
+ENTRYPOINT ["docker-entrypoint.sh"]