Skip to content

Commit

Permalink
Merge branch 'change-docker-image-name' into 'master'
Browse files Browse the repository at this point in the history
Use repo-specific name for bedrock Docker image

See merge request hdl-libraries/bedrock!210
  • Loading branch information
ldoolitt committed Nov 15, 2024
2 parents 679339f + 14c8147 commit c6ca8c8
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ stages:
variables:
XILINX_VIVADO: /non-free/Xilinx/Vivado/2020.2
CI_REGISTRY: mohs.dhcp.lbl.gov
CONTAINER_IMAGE: $CI_REGISTRY/testing_base_bookworm
# CONTAINER_IM_IMAGE: $CI_REGISTRY/riscv_bloat
CONTAINER_IMAGE: $CI_REGISTRY/bedrock_testing_base_bookworm
DOCKER_HOST: tcp://docker:2375/
DOCKER_DRIVER: overlay2

Expand All @@ -19,7 +18,6 @@ services:
- name: mohs.dhcp.lbl.gov/docker:20.10.12-dind
command: ["--insecure-registry", "mohs.dhcp.lbl.gov"]
alias: docker
# entrypoint: ["dockerd-entrypoint.sh"]

include:
- local: .gitlab/ci/badger.gitlab-ci.yml
Expand Down

0 comments on commit c6ca8c8

Please sign in to comment.