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

Update base image version #34

Merged
merged 4 commits into from
Mar 18, 2020
Merged

Update base image version #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
846fa84
Update base image version
msmcconnell Mar 18, 2020
56cfb6f
Update docker base image version
msmcconnell Mar 18, 2020
b0af2f2
Update config.yml
msmcconnell Mar 18, 2020
4217d5b
Update Dockerfile
msmcconnell Mar 18, 2020
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
# Pull docker image from docker hub
# XTERM used for better catkin_make output
docker:
- image: usdotfhwastol/carma-base:3.4.0
- image: usdotfhwastol/carma-base:3.7.0
user: carma
environment:
TERM: xterm
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
# License for the specific language governing permissions and limitations under
# the License.

FROM usdotfhwastol/carma-base:3.4.0 as setup
FROM usdotfhwastol/carma-base:3.7.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.4.0
FROM usdotfhwastol/carma-base:3.7.0

ARG BUILD_DATE="NULL"
ARG VERSION="NULL"
Expand Down