Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
1a94d97e
Unverified
Commit
1a94d97e
authored
3 years ago
by
Edward Thomson
Committed by
GitHub
3 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6343 from libgit2/ethomson/ci
ci: update dockerfiles for mbedTLS new url
parents
a2d2769b
5afc146a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
12 deletions
+16
-12
.github/workflows/main.yml
+5
-1
ci/docker/bionic
+4
-4
ci/docker/focal
+3
-3
ci/docker/xenial
+4
-4
No files found.
.github/workflows/main.yml
View file @
1a94d97e
...
...
@@ -241,7 +241,11 @@ jobs:
working-directory
:
${{ env.docker-config-path }}
if
:
matrix.platform.container.name != ''
-
name
:
Create container
run
:
docker build -t ${{ env.docker-registry-container-sha }} -f ${{ env.dockerfile }} .
run
:
|
if [ "${{ matrix.container.base }}" != "" ]; then
BASE_ARG="--build-arg BASE=${{ matrix.container.base }}"
fi
docker build -t ${{ env.docker-registry-container-sha }} --build-arg UID=$(id -u) --build-arg GID=$(id -g) ${BASE_ARG} -f ${{ env.dockerfile }} .
working-directory
:
${{ env.docker-config-path }}
if
:
matrix.platform.container.name != '' && env.docker-container-exists != 'true'
-
name
:
Build and test
...
...
This diff is collapsed.
Click to expand it.
ci/docker/bionic
View file @
1a94d97e
...
...
@@ -28,14 +28,14 @@ RUN apt-get update && \
FROM apt AS mbedtls
RUN cd /tmp && \
curl --location --silent --show-error https://
tls.mbed.org/download/mbedtls-2.16.2-apache.t
gz | \
tar -xz && \
cd mbedtls-2.16.2 && \
curl --location --silent --show-error https://
github.com/Mbed-TLS/mbedtls/archive/refs/tags/mbedtls-2.16.2.tar.
gz | \
tar -xz && \
cd mbedtls-
mbedtls-
2.16.2 && \
scripts/config.pl set MBEDTLS_MD4_C 1 && \
CFLAGS=-fPIC cmake -G Ninja -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON . && \
ninja install && \
cd .. && \
rm -rf mbedtls-2.16.2
rm -rf mbedtls-
mbedtls-
2.16.2
FROM mbedtls AS adduser
ARG UID=""
...
...
This diff is collapsed.
Click to expand it.
ci/docker/focal
View file @
1a94d97e
...
...
@@ -32,9 +32,9 @@ RUN apt-get update && \
FROM apt AS mbedtls
RUN cd /tmp && \
curl --location --silent --show-error https://
tls.mbed.org/download/mbedtls-2.16.2-apache.t
gz | \
curl --location --silent --show-error https://
github.com/Mbed-TLS/mbedtls/archive/refs/tags/mbedtls-2.16.2.tar.
gz | \
tar -xz && \
cd mbedtls-2.16.2 && \
cd mbedtls-
mbedtls-
2.16.2 && \
scripts/config.pl unset MBEDTLS_AESNI_C && \
scripts/config.pl set MBEDTLS_MD4_C 1 && \
mkdir build build-msan && \
...
...
@@ -45,7 +45,7 @@ RUN cd /tmp && \
CC=clang-10 CFLAGS="-fPIC" cmake -G Ninja -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DUSE_STATIC_MBEDTLS_LIBRARY=OFF -DCMAKE_BUILD_TYPE=MemSanDbg -DCMAKE_INSTALL_PREFIX=/usr/local/msan .. && \
ninja install && \
cd .. && \
rm -rf mbedtls-2.16.2
rm -rf mbedtls-
mbedtls-
2.16.2
FROM mbedtls AS libssh2
RUN cd /tmp && \
...
...
This diff is collapsed.
Click to expand it.
ci/docker/xenial
View file @
1a94d97e
...
...
@@ -30,14 +30,14 @@ RUN apt-get update && \
FROM apt AS mbedtls
RUN cd /tmp && \
curl --location --silent --show-error https://
tls.mbed.org/download/mbedtls-2.16.2-apache.t
gz | \
tar -xz && \
cd mbedtls-2.16.2 && \
curl --location --silent --show-error https://
github.com/Mbed-TLS/mbedtls/archive/refs/tags/mbedtls-2.16.2.tar.
gz | \
tar -xz && \
cd mbedtls-
mbedtls-
2.16.2 && \
scripts/config.pl set MBEDTLS_MD4_C 1 && \
CFLAGS=-fPIC cmake -G Ninja -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON . && \
ninja install && \
cd .. && \
rm -rf mbedtls-2.16.2
rm -rf mbedtls-
mbedtls-
2.16.2
FROM mbedtls AS libssh2
RUN cd /tmp && \
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment