Skip to content

Commit ee9d103

Browse files
committed
Push scaphandre image to dockerhub
1 parent d17e18f commit ee9d103

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.github/workflows/docker-image.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -625,15 +625,13 @@ jobs:
625625
with:
626626
username: ${{ secrets.DOCKERHUB_USERNAME }}
627627
password: ${{ secrets.DOCKERHUB_TOKEN }}
628-
- name: Build local scaphandre image
628+
- name: Build and scaphandre image
629629
uses: docker/build-push-action@v5
630630
with:
631631
context: external_plugins/power_measuring_plugin
632632
file: Dockerfile-scaphandre
633633
platforms: linux/amd64,linux/arm64
634-
push: false
635-
load: true
636-
tags: scaphandre
634+
tags: tapis/scaphandre
637635
- name: Build and push power_measuring_plugin
638636
uses: docker/build-push-action@v5
639637
with:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ build-generating:
4242
cd external_plugins/image_generating_plugin/ && docker build -t tapis/image_generating_plugin_py:${TRAPS_REL} --build-arg REL=${TRAPS_REL} .; cd ../..
4343

4444
build-power:
45-
cd external_plugins/power_measuring_plugin/ && docker build -t scaphandre -f Dockerfile-scaphandre .; docker build -t tapis/power_measuring_plugin_py:${TRAPS_REL} --build-arg REL=${TRAPS_REL} .; cd ../..
45+
cd external_plugins/power_measuring_plugin/ && docker build -t tapis/scaphandre -f Dockerfile-scaphandre .; docker build -t tapis/power_measuring_plugin_py:${TRAPS_REL} --build-arg REL=${TRAPS_REL} .; cd ../..
4646

4747
build-oracle:
4848
cd external_plugins/oracle_plugin/ && docker build -t tapis/oracle_plugin:${TRAPS_REL} --build-arg REL=${TRAPS_REL} .; cd ../..

external_plugins/power_measuring_plugin/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG REL=use-build-arg
22
#FROM tapis/power_measuring_plugin:0.4.0 as builder
33

44
FROM tapis/camera_traps_py:$REL
5-
COPY --from=scaphandre /scaphandre /scaphandre
5+
COPY --from=tapis/scaphandre /scaphandre /scaphandre
66
# FROM tapis/camera_traps_py_3.8
77

88
ARG USER=root

0 commit comments

Comments
 (0)