From a288d541ef9fcd95ecb699d1f0a8380b13cc9254 Mon Sep 17 00:00:00 2001 From: itabrl Date: Wed, 16 Oct 2019 12:19:17 -0700 Subject: [PATCH 1/3] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 96722a2a..18f8cbbf 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.0.0 as setup +FROM usdotfhwastol/carma-base:3.1.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.0.0 +FROM usdotfhwastol/carma-base:3.1.0 ARG BUILD_DATE="NULL" ARG VERSION="NULL" From 2d2d0428ae1aac0fd7a0630ad4cb4c26bc029bcc Mon Sep 17 00:00:00 2001 From: itabrl Date: Thu, 17 Oct 2019 10:07:55 -0700 Subject: [PATCH 2/3] update package --- package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.xml b/package.xml index fb6a9458..4cc45bcc 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ avt_vimba_camera - 0.0.10 + 1.0.0 Wrapper of the Allied Vision Technologies (AVT) VIMBA Ethernet and Firewire SDK. Miquel Massot From 58320f5a6f0f6e8bb11e520f91569029f8c02e23 Mon Sep 17 00:00:00 2001 From: itabrl Date: Fri, 18 Oct 2019 11:36:40 -0700 Subject: [PATCH 3/3] update version in dockerfile and config file --- .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 4ee5eda3..3dcf54b1 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.1.0 + - image: usdotfhwastol/carma-base:3.2.0 user: carma environment: TERM: xterm diff --git a/Dockerfile b/Dockerfile index 18f8cbbf..ba23abb1 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.1.0 as setup +FROM usdotfhwastol/carma-base:3.2.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.1.0 +FROM usdotfhwastol/carma-base:3.2.0 ARG BUILD_DATE="NULL" ARG VERSION="NULL" diff --git a/docker/checkout.sh b/docker/checkout.sh index bc584cdf..0b3ecf9d 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 Version_3.0.0 --depth 1 +git clone https://github.com/usdot-fhwa-stol/CARMAMsgs.git ${dir}/src/CARMAMsgs --branch CARMASystem_3.1.0 --depth 1