Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-02 13:01:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12764 from danfengliu/add-git-for-drone-image

Browse Source 
Add git/golang/dns config in drone iamge
This commit is contained in:
danfengliu 2020-08-13 16:03:34 +08:00 committed by GitHub
commit 063204f029
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.yml
View File

@ -55,6 +55,8 @@ pipeline:
- npm_registry - npm_registry
- harbor_sign_key - harbor_sign_key
- harbor_sign_key_id - harbor_sign_key_id
- test_gs_key
- test_export_env
commands: commands:
- export DOMAIN=${CI_DOMAIN} - export DOMAIN=${CI_DOMAIN}
- export HOST_CONTAINER_ID=$(hostname) - export HOST_CONTAINER_ID=$(hostname)

12
tests/e2e-image/drone/Dockerfile
View File

@ -7,6 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
bc \ bc \
time \ time \
gcc \ gcc \
git \
python-dev \ python-dev \
libffi-dev \ libffi-dev \
libssl-dev \ libssl-dev \
@ -25,10 +26,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
wget curl \ wget curl \
parted \ parted \
#ip tool #ip tool
ethtool \ #ethtool \
iproute2 \ iproute2 \
bridge-utils \ #bridge-utils \
iputils-ping \ #iputils-ping \
# Add docker in docker support # Add docker in docker support
btrfs-tools \ btrfs-tools \
e2fsprogs \ e2fsprogs \
@ -49,6 +50,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
apt-get autoremove -y && \ apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN apt-get update && \
apt-get install golang -y
RUN apt-get update -y && \ RUN apt-get update -y && \
apt-get install -y zbar-tools libzbar-dev python-zbar apt-get install -y zbar-tools libzbar-dev python-zbar
RUN dpkg -L libzbar-dev; ls -l /usr/include/zbar.h RUN dpkg -L libzbar-dev; ls -l /usr/include/zbar.h
@ -91,4 +95,4 @@ RUN wget "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/di
COPY dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh COPY dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh
RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh
VOLUME /var/lib/docker VOLUME /var/lib/docker

9
tests/integration.sh Executable file → Normal file
View File

@ -58,6 +58,13 @@ else
harbor_target_bucket=$harbor_releases_bucket/$DRONE_BRANCH harbor_target_bucket=$harbor_releases_bucket/$DRONE_BRANCH
fi fi
export GS_PRIVATE_KEY=$GS_PRIVATE_KEY
export TEST_EXPORT_ENV=$TEST_EXPORT_ENV
echo "1. ===========($TEST_GS_KEY)=========="
echo "2. ===========($test_gs_key)=========="
echo "3. ===========($TEST_EXPORT_ENV)=========="
echo "4. ===========($test_export_env)=========="
# GC credentials # GC credentials
keyfile="/root/harbor-ci-logs.key" keyfile="/root/harbor-ci-logs.key"
botofile="/root/.boto" botofile="/root/.boto"
@ -92,7 +99,6 @@ export Harbor_Assets_Version=$Harbor_Assets_Version
# the env is for online and offline package. # the env is for online and offline package.
export Harbor_Package_Version=$Harbor_Package_Version export Harbor_Package_Version=$Harbor_Package_Version
export NPM_REGISTRY=$NPM_REGISTRY export NPM_REGISTRY=$NPM_REGISTRY
# release branch must have their own base image with branch name, master and others will use the dev as base. # release branch must have their own base image with branch name, master and others will use the dev as base.
if [[ $DRONE_BRANCH == "release-"* ]]; then if [[ $DRONE_BRANCH == "release-"* ]]; then
Harbor_Build_Base_Tag=$target_release_version Harbor_Build_Base_Tag=$target_release_version
@ -223,3 +229,4 @@ if [ -f "$keyfile" ]; then
rm -f $keyfile rm -f $keyfile
fi fi