Skip to content

Commit 3c383db

Browse files
committed
fix: remove sconification steps
1 parent af1208c commit 3c383db

2 files changed

Lines changed: 6 additions & 139 deletions

File tree

.github/workflows/docker-build.yaml

Lines changed: 6 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
image_tag: ${{ steps.determine-tag.outputs.image_tag }}
2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2323
with:
2424
fetch-depth: 0
2525

@@ -51,15 +51,15 @@ jobs:
5151
echo "image_tag=dev-${SHORT_SHA}" | tee -a $GITHUB_OUTPUT
5252
else
5353
# This covers other branches
54-
echo "Processing feature/bugfix branch ${{ github.head_ref }}"
54+
echo "Processing feat/fix branch ${{ github.head_ref }}"
5555
echo "image_tag=feature-${SHORT_SHA}" | tee -a $GITHUB_OUTPUT
5656
fi
5757
fi
5858
5959
build-oci-image:
6060
name: Build OCI image
6161
needs: prepare
62-
uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/docker-build.yml@docker-build-v2.4.0
62+
uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/docker-build.yml@docker-build-v3.3.0
6363
with:
6464
image-name: docker-regis.iex.ec/python-hello-world
6565
image-tag: ${{ needs.prepare.outputs.image_tag }}
@@ -70,53 +70,9 @@ jobs:
7070
security-scan: true
7171
security-report: "sarif"
7272
hadolint: true
73-
platforms: linux/amd64
73+
platform: linux/amd64
7474
secrets:
75+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
76+
dockerhub-password: ${{ secrets.DOCKERHUB_TOKEN_PULL_ONLY }}
7577
username: ${{ secrets.NEXUS_USERNAME }}
7678
password: ${{ secrets.NEXUS_PASSWORD }}
77-
78-
build-tee-image:
79-
name: Build TEE image
80-
needs: [prepare, build-oci-image]
81-
runs-on: ubuntu-latest
82-
env:
83-
native_image: docker-regis.iex.ec/python-hello-world
84-
enclave_image: docker-regis.iex.ec/python-hello-world-unlocked
85-
sconify_image: registry.scontain.com/scone-debug/iexec-sconify-image-unlocked
86-
sconify_version: 5.9.1
87-
steps:
88-
- name: Login to Scontain registry
89-
uses: docker/login-action@v3
90-
with:
91-
registry: registry.scontain.com
92-
username: ${{ secrets.SCONTAIN_REGISTRY_USERNAME }}
93-
password: ${{ secrets.SCONTAIN_REGISTRY_PAT }}
94-
- name: Login to Docker regis
95-
uses: docker/login-action@v3
96-
with:
97-
registry: docker-regis.iex.ec
98-
username: ${{ secrets.NEXUS_USERNAME }}
99-
password: ${{ secrets.NEXUS_PASSWORD }}
100-
- name: Pull sconification tools
101-
run: docker pull $sconify_image:$sconify_version
102-
- name: Pull native image
103-
run: docker pull $native_image:${{ needs.prepare.outputs.image_tag }}
104-
- name: Sconify
105-
run: |
106-
IMG_FROM=$native_image:${{ needs.prepare.outputs.image_tag }}
107-
IMG_TO=$enclave_image:${{ needs.prepare.outputs.image_tag }}-sconify-$sconify_version-debug
108-
SCONE_IMAGE=$sconify_image:$sconify_version
109-
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock $SCONE_IMAGE \
110-
sconify_iexec --cli=$SCONE_IMAGE --crosscompiler=$SCONE_IMAGE \
111-
--from=$IMG_FROM --to=$IMG_TO --binary-fs --fs-dir=/app --binary=/usr/local/bin/python3.7 \
112-
--heap=1G --host-path=/etc/hosts --host-path=/etc/resolv.conf --no-color --verbose
113-
echo
114-
docker run --rm -e SCONE_HASH=1 $IMG_TO
115-
- name: Push TEE image
116-
run: docker push $enclave_image:${{ needs.prepare.outputs.image_tag }}-sconify-$sconify_version-debug
117-
- name: Clean OCI images
118-
run: |
119-
docker image rm -f \
120-
$native_image:${{ needs.prepare.outputs.image_tag }} \
121-
$enclave_image:${{ needs.prepare.outputs.image_tag }}-sconify-$sconify_version-debug \
122-
$sconify_image:$sconify_version

.github/workflows/sconify-release.yaml

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)