From 6fceccbf405e8393020b2df34e61fa4e83486a2c Mon Sep 17 00:00:00 2001 From: Michael McConnell Date: Mon, 11 Nov 2019 15:03:45 -0500 Subject: [PATCH 1/3] Update base docker image version to carma-base:3.3.0 --- .circleci/config.yml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3dcf54b1..2ece8577 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: # Pull docker image from docker hub # XTERM used for better catkin_make output docker: - - image: usdotfhwastol/carma-base:3.2.0 + - image: usdotfhwastol/carma-base:3.3.0 user: carma environment: TERM: xterm diff --git a/Dockerfile b/Dockerfile index ba23abb1..8a038922 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,14 +12,14 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastol/carma-base:3.2.0 as setup +FROM usdotfhwastol/carma-base:3.3.0 as setup RUN mkdir ~/src COPY --chown=carma . /home/carma/src/CARMAAvtVimbaDriver RUN ~/src/CARMAAvtVimbaDriver/docker/checkout.sh RUN ~/src/CARMAAvtVimbaDriver/docker/install.sh -FROM usdotfhwastol/carma-base:3.2.0 +FROM usdotfhwastol/carma-base:3.3.0 ARG BUILD_DATE="NULL" ARG VERSION="NULL" From 07586187117dfc51e05670a330ba5e35a567a1ac Mon Sep 17 00:00:00 2001 From: qswawrq Date: Thu, 14 Nov 2019 15:17:41 -0500 Subject: [PATCH 2/3] Update checkout.sh --- docker/checkout.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/checkout.sh b/docker/checkout.sh index 0b3ecf9d..f5d80dd4 100755 --- a/docker/checkout.sh +++ b/docker/checkout.sh @@ -24,4 +24,4 @@ if [[ -n ${1} ]]; then dir=${1} fi -git clone https://github.com/usdot-fhwa-stol/CARMAMsgs.git ${dir}/src/CARMAMsgs --branch CARMASystem_3.1.0 --depth 1 +git clone https://github.com/usdot-fhwa-stol/CARMAMsgs.git ${dir}/src/CARMAMsgs --branch develop --depth 1 From c7df703ecd1c10eb11cc5f5acf19d3f09a29115d Mon Sep 17 00:00:00 2001 From: jtbaird Date: Wed, 11 Dec 2019 17:17:44 -0500 Subject: [PATCH 3/3] updated CARMAMsgs version, and carma-base image version --- .circleci/config.yml | 2 +- Dockerfile | 4 ++-- docker/checkout.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ece8577..f4d8b2bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: # Pull docker image from docker hub # XTERM used for better catkin_make output docker: - - image: usdotfhwastol/carma-base:3.3.0 + - image: usdotfhwastol/carma-base:3.4.0 user: carma environment: TERM: xterm diff --git a/Dockerfile b/Dockerfile index 8a038922..c3fb328c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,14 +12,14 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastol/carma-base:3.3.0 as setup +FROM usdotfhwastol/carma-base:3.4.0 as setup RUN mkdir ~/src COPY --chown=carma . /home/carma/src/CARMAAvtVimbaDriver RUN ~/src/CARMAAvtVimbaDriver/docker/checkout.sh RUN ~/src/CARMAAvtVimbaDriver/docker/install.sh -FROM usdotfhwastol/carma-base:3.3.0 +FROM usdotfhwastol/carma-base:3.4.0 ARG BUILD_DATE="NULL" ARG VERSION="NULL" diff --git a/docker/checkout.sh b/docker/checkout.sh index f5d80dd4..727905c5 100755 --- a/docker/checkout.sh +++ b/docker/checkout.sh @@ -24,4 +24,4 @@ if [[ -n ${1} ]]; then dir=${1} fi -git clone https://github.com/usdot-fhwa-stol/CARMAMsgs.git ${dir}/src/CARMAMsgs --branch develop --depth 1 +git clone https://github.com/usdot-fhwa-stol/CARMAMsgs.git ${dir}/src/CARMAMsgs --branch CARMAMsgs_1.1.0 --depth 1