Skip to content

Commit

Permalink
Merge pull request #442 from skalenetwork/bug/438-ubuntu22-build
Browse files Browse the repository at this point in the history
#438 fix release builds
  • Loading branch information
olehnikolaiev authored Dec 16, 2024
2 parents 7b23e69 + d9e1d8c commit e70a4c9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/dockerimageintelsubmission.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:
- uses: actions/checkout@v2
- name: submodule update
run: git submodule update --init --recursive
- name: build and deploy test image
run: python3 scripts/docker_build.py DockerfileIntelSubmission sgxwallet_intelsubmission ${GITHUB_SHA}
- name: build and deploy docker image
if: |
contains(github.ref, 'develop') || contains(github.ref, 'beta') ||
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN pip3 install requests torpy

RUN touch /var/hwmode
RUN ./autoconf.bash
RUN ./configure --enable-sgx
RUN ./configure
RUN bash -c "make -j$(nproc)"
RUN ccache -sz
RUN mkdir -p /usr/src/sdk/sgx_data
Expand Down
5 changes: 3 additions & 2 deletions DockerfileIntelSubmission
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ RUN pip3 install requests torpy
RUN cd scripts && ./generate_signing_key.bash
RUN touch /var/hwmode
RUN ./autoconf.bash
RUN ./configure --with-sgx-build=release
RUN ./configure --with-sgx-build=prerelease
RUN bash -c "make -j$(nproc)"
RUN ccache -sz
RUN mkdir -p /usr/src/sdk/sgx_data
COPY docker/start.sh ./
COPY docker/check_firewall.py ./
RUN rm -rf /usr/src/sdk/sgx-sdk-build/
RUN rm /opt/intel/sgxsdk/lib64/*_sim.so
RUN rm /opt/intel/sgxsdk/lib64/*_sim.so
ENTRYPOINT ["/usr/src/sdk/start.sh"]
3 changes: 2 additions & 1 deletion DockerfileRelease
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ RUN pip3 install requests torpy
RUN touch /var/hwmode
RUN ./autoconf.bash
RUN ./configure --with-sgx-build=release
RUN cd secure_enclave && bash -c "make secure_enclave.so -j$(nproc)"
RUN cd scripts && ./sign_enclave.bash
RUN bash -c "make -j$(nproc)"
RUN ccache -sz
RUN cd scripts && ./sign_enclave.bash
RUN mkdir -p /usr/src/sdk/sgx_data
COPY docker/start.sh ./
COPY docker/check_firewall.py ./
Expand Down

0 comments on commit e70a4c9

Please sign in to comment.