Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try to build dockerhub images from jsk_travis/docker #420

Merged
merged 3 commits into from
May 5, 2021
Merged

try to build dockerhub images from jsk_travis/docker #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c342ee
ubuntu 14.04 need Python >= 2.7.9 to run pip
k-okada Apr 29, 2021
39728b9
use INCLUDE+ syntax, to run docker build within same directory, witho…
k-okada Apr 29, 2021
7444ceb
Merge branch 'master' into fix_for_dockerhub
k-okada May 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion docker/Dockerfile.ros-ubuntu:12.04-base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM ros-ubuntu:12.04
# syntax = edrevo/dockerfile-plus

INCLUDE+ Dockerfile.ros-ubuntu:12.04

RUN sudo apt-get update && sudo apt-get dist-upgrade -y
8 changes: 7 additions & 1 deletion docker/Dockerfile.ros-ubuntu:14.04
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y python-vtk tcl-vtk

RUN apt-get update && apt-get install -y python-pip
RUN pip install -U dlib
# Install pip
# See https://github.com/pypa/pip/issues/4805 for detail.
# https://github.com/pypa/pypi-support/issues/978 requires Python >= 2.7.9
RUN apt-get update && sudo apt-get install -y software-properties-common
RUN add-apt-repository -y ppa:longsleep/python2.7-backports
RUN apt-get update && sudo apt-get dist-upgrade -y
RUN pip install -U dlib==19.21.1

RUN apt-get update && apt-get install -y curl git wget sudo lsb-release ccache apt-cacher-ng patch man-db
RUN apt-get update && apt-get install -y mesa-utils
Expand Down
4 changes: 3 additions & 1 deletion docker/Dockerfile.ros-ubuntu:14.04-base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM ros-ubuntu:14.04
# syntax = edrevo/dockerfile-plus

INCLUDE+ Dockerfile.ros-ubuntu:14.04

RUN sudo apt-get update && sudo apt-get dist-upgrade -y
4 changes: 3 additions & 1 deletion docker/Dockerfile.ros-ubuntu:14.04-pcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM ros-ubuntu:14.04
# syntax = edrevo/dockerfile-plus

INCLUDE+ Dockerfile.ros-ubuntu:14.04

RUN sudo apt-get update
RUN sudo apt-get install -y python-vtk tcl-vtk
Expand Down
4 changes: 3 additions & 1 deletion docker/Dockerfile.ros-ubuntu:14.04-pcl1.8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM ros-ubuntu:14.04
# syntax = edrevo/dockerfile-plus

INCLUDE+ Dockerfile.ros-ubuntu:14.04

RUN cd ~ && \
wget -q https://github.com/PointCloudLibrary/pcl/archive/pcl-1.8.0rc2.tar.gz && \
Expand Down
4 changes: 3 additions & 1 deletion docker/Dockerfile.ros-ubuntu:16.04-base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM ros-ubuntu:16.04
# syntax = edrevo/dockerfile-plus

INCLUDE+ Dockerfile.ros-ubuntu:16.04

RUN sudo apt-get update && sudo apt-get dist-upgrade -y
4 changes: 3 additions & 1 deletion docker/Dockerfile.ros-ubuntu:16.04-pcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM ros-ubuntu:16.04
# syntax = edrevo/dockerfile-plus

INCLUDE+ Dockerfile.ros-ubuntu:16.04

RUN sudo apt-get update
RUN sudo apt-get install -y ros-kinetic-pcl-conversions ros-kinetic-pcl-ros ros-kinetic-octomap-server
Expand Down
4 changes: 3 additions & 1 deletion docker/Dockerfile.ros-ubuntu:18.04-base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM ros-ubuntu:18.04
# syntax = edrevo/dockerfile-plus

INCLUDE+ Dockerfile.ros-ubuntu:18.04

RUN sudo apt-get update && sudo apt-get dist-upgrade -y
4 changes: 3 additions & 1 deletion docker/Dockerfile.ros-ubuntu:18.04-pcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM ros-ubuntu:18.04
# syntax = edrevo/dockerfile-plus

INCLUDE+ Dockerfile.ros-ubuntu:18.04

RUN sudo apt-get update
RUN sudo apt-get install -y ros-melodic-pcl-conversions ros-melodic-pcl-ros ros-melodic-octomap-server
Expand Down
4 changes: 3 additions & 1 deletion docker/Dockerfile.ros-ubuntu:20.04-base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM ros-ubuntu:20.04
# syntax = edrevo/dockerfile-plus

INCLUDE+ Dockerfile.ros-ubuntu:20.04

RUN sudo apt-get update && sudo apt-get dist-upgrade -y
4 changes: 3 additions & 1 deletion docker/Dockerfile.ros-ubuntu:20.04-pcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM ros-ubuntu:20.04
# syntax = edrevo/dockerfile-plus

INCLUDE+ Dockerfile.ros-ubuntu:20.04

RUN sudo apt-get update
RUN sudo apt-get install -y ros-noetic-pcl-conversions ros-noetic-pcl-ros ros-noetic-octomap-server
Expand Down
30 changes: 15 additions & 15 deletions docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,63 +6,63 @@ all: 12.04-base 14.04-base 14.04-base 18.04-base 20.04-base \

12.04-base: 12.04 Dockerfile.ros-ubuntu\:12.04-base
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

12.04: Dockerfile.ros-ubuntu\:12.04
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

14.04-pcl1.8: 14.04 Dockerfile.ros-ubuntu\:14.04-pcl1.8
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

14.04-pcl: 14.04 Dockerfile.ros-ubuntu\:14.04-pcl
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

14.04-base: 14.04 Dockerfile.ros-ubuntu\:14.04-base
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

14.04: Dockerfile.ros-ubuntu\:14.04
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

16.04-pcl: 16.04 Dockerfile.ros-ubuntu\:16.04-pcl
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

16.04-base: 16.04 Dockerfile.ros-ubuntu\:16.04-base
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

16.04: Dockerfile.ros-ubuntu\:16.04
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

18.04-pcl: 18.04 Dockerfile.ros-ubuntu\:18.04-pcl
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

18.04-base: 18.04 Dockerfile.ros-ubuntu\:18.04-base
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

18.04: Dockerfile.ros-ubuntu\:18.04
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

20.04-pcl: 20.04 Dockerfile.ros-ubuntu\:20.04-pcl
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

20.04-base: 20.04 Dockerfile.ros-ubuntu\:20.04-base
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

20.04: Dockerfile.ros-ubuntu\:20.04
echo "Building $@"
docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .
DOCKER_BUILDKIT=1 docker build -t ros-ubuntu:$@ $(DOCKER_BUILD_ARGS) -f Dockerfile.ros-ubuntu:$@ .

.PHONY: Dockerfile.ros-ubuntu\:12.04 Dockerfile.ros-ubuntu\:12.04-base \
Dockerfile.ros-ubuntu\:14.04 Dockerfile.ros-ubuntu\:14.04-base Dockerfile.ros-ubuntu\:14.04-pcl Dockerfile.ros-ubuntu\:14.04-pcl1.8 \
Expand Down