Skip to content

Commit fdbc71a

Browse files
committed
updated docker build
1 parent 44d6b2f commit fdbc71a

File tree

2 files changed

+25
-6
lines changed

2 files changed

+25
-6
lines changed

.ci/Dockerfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FROM ctumrs/ros:noetic
2+
3+
RUN apt-get -y update
4+
5+
# workaround interractive prompts during apt installations
6+
RUN echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
7+
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install keyboard-configuration
8+
9+
# INSTALL the MRS UAV System
10+
11+
RUN apt-get -y install software-properties-common curl bash
12+
13+
RUN curl https://ctu-mrs.github.io/ppa-stable/add_ppa.sh | bash
14+
15+
RUN apt-get -y install ros-noetic-mrs-uav-system-full
16+
17+
CMD ["bash"]

.ci/build_docker.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ set -e
55
trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
66
trap 'echo "$0: \"${last_command}\" command failed with exit code $?' ERR
77

8-
git clone https://github.com/ctu-mrs/mrs_docker
9-
cd mrs_docker/recipes
8+
# get the path to this script
9+
MY_PATH=`dirname "$0"`
10+
MY_PATH=`( cd "$MY_PATH" && pwd )`
1011

11-
docker login --username klaxalk --password $TOKEN
12+
cd $MY_PATH
1213

13-
# docker build . --file docker/without_linux_setup --tag ctumrs/mrs_uav_system:latest
14+
docker login --username klaxalk --password $TOKEN
1415

1516
WEEK_TAG="`date +%Y`_w`date +%V`"
1617

17-
docker buildx create --name container --driver=docker-container
18-
docker buildx build . --file Dockerfile --builder container --tag ctumrs/mrs_uav_system:latest --tag ctumrs/mrs_uav_system:${WEEK_TAG} --platform=linux/amd64,linux/arm64 --push
18+
docker buildx create --name container --driver=docker-container --use
19+
20+
docker buildx build . --file Dockerfile --tag ctumrs/mrs_uav_system:latest --tag ctumrs/mrs_uav_system:${WEEK_TAG} --platform=linux/amd64,linux/arm64 --push

0 commit comments

Comments
 (0)