mirror of
https://github.com/goharbor/harbor.git
synced 2024-11-25 03:35:21 +01:00
Add git/golang/dns config in drone image
Signed-off-by: danfengliu <danfengl@vmware.com>
This commit is contained in:
parent
7970f77ce2
commit
601d1ef0eb
@ -55,6 +55,8 @@ pipeline:
|
||||
- npm_registry
|
||||
- harbor_sign_key
|
||||
- harbor_sign_key_id
|
||||
- test_gs_key
|
||||
- test_export_env
|
||||
commands:
|
||||
- export DOMAIN=${CI_DOMAIN}
|
||||
- export HOST_CONTAINER_ID=$(hostname)
|
||||
|
@ -7,6 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
bc \
|
||||
time \
|
||||
gcc \
|
||||
git \
|
||||
python-dev \
|
||||
libffi-dev \
|
||||
libssl-dev \
|
||||
@ -25,10 +26,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
wget curl \
|
||||
parted \
|
||||
#ip tool
|
||||
ethtool \
|
||||
#ethtool \
|
||||
iproute2 \
|
||||
bridge-utils \
|
||||
iputils-ping \
|
||||
#bridge-utils \
|
||||
#iputils-ping \
|
||||
# Add docker in docker support
|
||||
btrfs-tools \
|
||||
e2fsprogs \
|
||||
@ -49,6 +50,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
apt-get autoremove -y && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install golang -y
|
||||
|
||||
RUN apt-get update -y && \
|
||||
apt-get install -y zbar-tools libzbar-dev python-zbar
|
||||
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
|
||||
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
9
tests/integration.sh
Executable file → Normal file
@ -58,6 +58,13 @@ else
|
||||
harbor_target_bucket=$harbor_releases_bucket/$DRONE_BRANCH
|
||||
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
|
||||
keyfile="/root/harbor-ci-logs.key"
|
||||
botofile="/root/.boto"
|
||||
@ -92,7 +99,6 @@ export Harbor_Assets_Version=$Harbor_Assets_Version
|
||||
# the env is for online and offline package.
|
||||
export Harbor_Package_Version=$Harbor_Package_Version
|
||||
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.
|
||||
if [[ $DRONE_BRANCH == "release-"* ]]; then
|
||||
Harbor_Build_Base_Tag=$target_release_version
|
||||
@ -223,3 +229,4 @@ if [ -f "$keyfile" ]; then
|
||||
rm -f $keyfile
|
||||
fi
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user