diff --git a/centos_build_layer.cfg b/centos_build_layer.cfg deleted file mode 100644 index c581999..0000000 --- a/centos_build_layer.cfg +++ /dev/null @@ -1 +0,0 @@ -flock diff --git a/centos_iso_image.inc b/centos_iso_image.inc deleted file mode 100644 index c24cfab..0000000 --- a/centos_iso_image.inc +++ /dev/null @@ -1 +0,0 @@ -registry-token-server diff --git a/centos_pkg_dirs b/centos_pkg_dirs deleted file mode 100644 index c24cfab..0000000 --- a/centos_pkg_dirs +++ /dev/null @@ -1 +0,0 @@ -registry-token-server diff --git a/centos_tarball-dl.lst b/centos_tarball-dl.lst deleted file mode 100644 index 950ec7f..0000000 --- a/centos_tarball-dl.lst +++ /dev/null @@ -1,6 +0,0 @@ -Sirupsen-logrus-3d4380f53a34dcdc95f0c1db702615992b38d9a4.tar.gz#Sirupsen-logrus#github.com/Sirupsen/logrus/archive/3d4380f53a34dcdc95f0c1db702615992b38d9a4.tar.gz#http## -docker-distribution-v2.7.1.tar.gz#docker-distribution-2.7.1#https://github.com/docker/distribution/archive/v2.7.1.tar.gz#http## -docker-libtrust-fa567046d9b14f6aa788882a950d69651d230b21.tar.gz#docker-libtrust#https://github.com/docker/libtrust/archive/fa567046d9b14f6aa788882a950d69651d230b21.tar.gz#http## -gophercloud-gophercloud-aa00757ee3ab58e53520b6cb910ca0543116400a.tar.gz#gophercloud-gophercloud#github.com/gophercloud/gophercloud/archive/aa00757ee3ab58e53520b6cb910ca0543116400a.tar.gz#http## -gorilla-context-08b5f424b9271eedf6f9f0ce86cb9396ed337a42.tar.gz#gorilla-context#https://github.com/gorilla/context/archive/08b5f424b9271eedf6f9f0ce86cb9396ed337a42.tar.gz#http## -gorilla-mux-599cba5e7b6137d46ddf58fb1765f5d928e69604.tar.gz#gorilla-mux#https://github.com/gorilla/mux/archive/599cba5e7b6137d46ddf58fb1765f5d928e69604.tar.gz#http## diff --git a/registry-token-server/centos/build_srpm.data b/registry-token-server/centos/build_srpm.data deleted file mode 100644 index a5afee4..0000000 --- a/registry-token-server/centos/build_srpm.data +++ /dev/null @@ -1,11 +0,0 @@ -TAR_NAME="registry-token-server" -SRC_DIR="$PKG_BASE/src" -COPY_LIST=" \ - $FILES_BASE/* \ - $STX_BASE/downloads/Sirupsen-logrus-3d4380f53a34dcdc95f0c1db702615992b38d9a4.tar.gz \ - $STX_BASE/downloads/docker-distribution-v2.7.1.tar.gz \ - $STX_BASE/downloads/docker-libtrust-fa567046d9b14f6aa788882a950d69651d230b21.tar.gz \ - $STX_BASE/downloads/gophercloud-gophercloud-aa00757ee3ab58e53520b6cb910ca0543116400a.tar.gz \ - $STX_BASE/downloads/gorilla-mux-599cba5e7b6137d46ddf58fb1765f5d928e69604.tar.gz \ -" -TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/registry-token-server/centos/files/registry-token-server.service b/registry-token-server/centos/files/registry-token-server.service deleted file mode 100644 index 477e85d..0000000 --- a/registry-token-server/centos/files/registry-token-server.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=v2 Registry token server for Docker - -[Service] -Type=simple -EnvironmentFile=/etc/docker-distribution/registry/token_server.conf -ExecStart=/usr/bin/registry-token-server -addr=${REGISTRY_TOKEN_SERVER_ADDR} \ - -issuer=${REGISTRY_TOKEN_SERVER_ISSUER} \ - -endpoint=${REGISTRY_TOKEN_SERVER_KS_ENDPOINT} \ - -tlscert=${REGISTRY_TOKEN_SERVER_TLSCERT} \ - -tlskey=${REGISTRY_TOKEN_SERVER_TLSKEY} \ - -realm=${REGISTRY_TOKEN_SERVER_REALM} \ - -key=${REGISTRY_TOKEN_SERVER_KEY} -Restart=on-failure -ExecStartPost=/bin/bash -c 'echo $MAINPID > /var/run/registry-token-server.pid' -ExecStopPost=/bin/rm -f /var/run/registry-token-server.pid - -[Install] -WantedBy=multi-user.target diff --git a/registry-token-server/centos/files/token-server-certificate.pem b/registry-token-server/centos/files/token-server-certificate.pem deleted file mode 100644 index c40df59..0000000 --- a/registry-token-server/centos/files/token-server-certificate.pem +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDADCCAegCCQCSevkS4h7LQjANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJY -WDEVMBMGA1UEBwwMRGVmYXVsdCBDaXR5MRwwGgYDVQQKDBNEZWZhdWx0IENvbXBh -bnkgTHRkMB4XDTE4MDkyMTE0MTYwOFoXDTE5MDkyMTE0MTYwOFowQjELMAkGA1UE -BhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UECgwTRGVmYXVsdCBD -b21wYW55IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtCbNJ/ -aPEMkZFEtMKRomOh9NgeOv0jYFY5i23fXghtTgdXu9//H3Huz5/KDJ+XEUp2DZgK -YQ2UHVR+cqj2sFjCllfAVrzmv9FFR0CQpQxqKcxChefVwsMh6XsqF+GzbqzFOx67 -bT39Xb5+spAmDHctFl3nrmyA1wM6e+OXcktC0chILeN+UEyq5Xeng6/BpVnI2UaY -J1OpfuUrffddy5t0oeuKGZ/xG2g9sL6GMGBeVslOmLg4CBOwq3knUGoOTFYSjHVx -rU/p4YgUotIUvb4GBsXqbiI7M2NakItTR6mxfcYiKkxfjadQlptFyGucI84mMYx8 -vO3o6TFLfcTYqZ8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAHXZR0U0pyMkYIeO5 -Y/n0H9Onj/PtCJHBbYzMHZGMPlX2IbW+JAeE/0XNIYGHtAtFwlb825Tkg2p7wpa8 -8HmOBqkTyn2ywDdmPqdfjCiMu/Ge6tkLjqkmYWv2l/d4+qEMR4dUh9g8SrrtUdZg -DP7H22B+0knQ7s04JuiJ27hqi4nPOzdwdJNpz5Przgce8vN1ihk8194pR/uoNrjP -td3Po+DwmxFKigoKPQCHgQuD63mAFor4vVnht+IkNbB3/lQyXP6Qv7DnWVW9WDBL -nKxgXhRwyy5mYebYmwA//JX41O/Kdp1Q6oWgv4zSLd8M9FIMtESG8k4gSl0XfUBa -Y24p0Q== ------END CERTIFICATE----- diff --git a/registry-token-server/centos/files/token-server-private-key.pem b/registry-token-server/centos/files/token-server-private-key.pem deleted file mode 100644 index 4332eb3..0000000 --- a/registry-token-server/centos/files/token-server-private-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAq0Js0n9o8QyRkUS0wpGiY6H02B46/SNgVjmLbd9eCG1OB1e7 -3/8fce7Pn8oMn5cRSnYNmAphDZQdVH5yqPawWMKWV8BWvOa/0UVHQJClDGopzEKF -59XCwyHpeyoX4bNurMU7HrttPf1dvn6ykCYMdy0WXeeubIDXAzp745dyS0LRyEgt -435QTKrld6eDr8GlWcjZRpgnU6l+5St9913Lm3Sh64oZn/EbaD2wvoYwYF5WyU6Y -uDgIE7CreSdQag5MVhKMdXGtT+nhiBSi0hS9vgYGxepuIjszY1qQi1NHqbF9xiIq -TF+Np1CWm0XIa5wjziYxjHy87ejpMUt9xNipnwIDAQABAoIBAFHCIV+QkdHZ9TiL -u1vT2NmFvPTb4b9tfxVK3YRziVmujPy2Zqu2CRYEMzyOYd5iaU/J8g1ujwzDdAkd -YLHHK0MEim+UFBSUeGh4kV6CbzjxCclIzNJz20n6y5MP8ly+o4x5kBLI2YsphPJn -W+mzMGpIrQ/hhgSosX0KE5EAgQDqOfJSlhZvSgSO5UF9nXvEn7Y9Zc8GK0XQdcwB -Pr8iFhuhEJmmb4LrCm+3Me/fhLxFjUAOAcLSkFnqfxo2vAuRqk99OOLxFEfPYZB8 -kLkKlQ+PwhkG3pjPg6w/rOmBHqW/ZEpd87972JWeHscXYpb/cLLVmcJbZI/claos -YOHS7CECgYEA4XKo7GzuqSkLskfaZM2pyNhHbxphqyNfk8GmW5NJnKavpmY8YiXh -7hNXXf4HCkcHvHMn4JUCHgHVavDNhNnrHNrQAzO3KwuUrrFiBP+yP1tRyQ4BP395 -KIBSUyeEOo9vM7d3yerI8WHboio5gaoqEfeNS1dakZ6ZiOpoP94CIxECgYEAwnfW -Drdcqkpj794gYDlXH4D279f7+qmq11eI4C0zkZzTFkExl8BGfqpy49kruaTm0e4t -L1B23TYfKC0ei4BQskyNCHUnl/eic/JHe9gJRd6BAZi2REfV0LI4ytYGgniCu50H -EJVvTVMXS/+wWcjZr037oV6/WiB9Wzr7Z1oFoa8CgYBlmqdG5lEpK7Z5wqhKheXe -/pozGFCsMGUC0mOHIfoq/3RqKelM0oXgJhdZ5QKHPzvdUojGTmGF5I2qhJwbI5sy -her5hnUmkTGRCaCDYDmVFDLnycgGNg0Ek9CGaWjOe5ZCWI1EEuw83T1++Eiyh14u -esLTEatftXq8megh4IxWAQKBgQCTNfox27ZnJrcuXn0tulpse8jy2RJjt0qfhyET -asRN52SXxTRQhvoWattcBgsmlmEw69cCqSvB23WMiVNFERaFUpO0olMdpBUzJmXc -pzal0IDh/4OCfsqqGDALxCbbX3S/p2gwsp617z+EhYMvBG9dWHAywTGjfVLH3Ady -PmBi+wKBgQCWJS/PmTpyO8LU4MYZk91mJmjHAsPlgi/9n8yEqdmins+X698IsoCr -s2FN8rol8+UP8c3m9o4kp62ouoby2QzAZw0y3UGWcxOb3ZpoozatKodsoETSLLoL -T//wVn2Z2MsS9tLOBLZzsZiYlHyYxTUm7UTOdxdjbSLWVdLbCpKEhg== ------END RSA PRIVATE KEY----- diff --git a/registry-token-server/centos/registry-token-server.spec b/registry-token-server/centos/registry-token-server.spec deleted file mode 100644 index 4617137..0000000 --- a/registry-token-server/centos/registry-token-server.spec +++ /dev/null @@ -1,81 +0,0 @@ -%if ! 0%{?gobuild:1} -%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; -%endif - -Name: registry-token-server -Version: 1.0.0 -Release: 1%{?_tis_dist}.%{tis_patch_ver} -Summary: Token server for use with Docker registry with Openstack Keystone back end -License: ASL 2.0 -Source0: registry-token-server-%{version}.tar.gz -Source1: %{name}.service -Source2: token_server.conf - -# Go dependencies downloaded as tarballs -Source10: Sirupsen-logrus-3d4380f53a34dcdc95f0c1db702615992b38d9a4.tar.gz -Source11: docker-distribution-v2.7.1.tar.gz -Source12: docker-libtrust-fa567046d9b14f6aa788882a950d69651d230b21.tar.gz -Source13: gophercloud-gophercloud-aa00757ee3ab58e53520b6cb910ca0543116400a.tar.gz -Source14: gorilla-mux-599cba5e7b6137d46ddf58fb1765f5d928e69604.tar.gz - -BuildRequires: systemd -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd - -# Build with our own prefered golang, not 1.11 from CentOS -# BuildRequires: golang >= 1.6 -BuildRequires: golang >= 1.13 -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - -%description -%{summary} - -%prep -%setup -q -n registry-token-server-%{version} - -# Extract other go dependencies -%setup -T -D -a 10 -%setup -T -D -a 11 -%setup -T -D -a 12 -%setup -T -D -a 13 -%setup -T -D -a 14 -mkdir -p _build/src/github.com/gorilla/ && mv gorilla-mux _build/src/github.com/gorilla/mux -mkdir -p _build/src/github.com/docker/ && mv docker-distribution-2.7.1 _build/src/github.com/docker/distribution -mkdir -p _build/src/github.com/docker/ && mv docker-libtrust _build/src/github.com/docker/libtrust -mkdir -p _build/src/github.com/Sirupsen/ && mv Sirupsen-logrus _build/src/github.com/Sirupsen/logrus -mkdir -p _build/src/github.com/gophercloud && mv gophercloud-gophercloud _build/src/github.com/gophercloud/gophercloud - -%build -mkdir -p ./_build/src/ -ln -s $(pwd) ./_build/src/registry-token-server -export GOPATH=$(pwd)/_build -go env -w GO111MODULE=auto - -cd ./_build/src/registry-token-server -%gobuild -o bin/registry-token-server registry-token-server - -%install -install -d -p %{buildroot}%{_bindir} -install -p -m 0755 bin/registry-token-server %{buildroot}%{_bindir} - -# install systemd/init scripts -install -d %{buildroot}%{_unitdir} -install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir} - -# install directory to install default certificate -install -d -p %{buildroot}%{_sysconfdir}/ssl/private - -# install environment variables file for service file -install -d -p %{buildroot}%{_sysconfdir}/%{name}/registry -install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/registry - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%files -%doc LICENSE - -%{_bindir}/registry-token-server -%{_unitdir}/%{name}.service -%{_sysconfdir}/%{name}/registry/token_server.conf diff --git a/registry-token-server/debian/meta_data.yaml b/registry-token-server/debian/meta_data.yaml index 02be0ca..a37add1 100644 --- a/registry-token-server/debian/meta_data.yaml +++ b/registry-token-server/debian/meta_data.yaml @@ -3,7 +3,7 @@ debname: registry-token-server debver: 1.0-1 src_path: src src_files: -- centos/files/token_server.conf +- files/token_server.conf dl_files: Sirupsen-logrus-3d4380f53a34dcdc95f0c1db702615992b38d9a4.tar.gz: topdir: Sirupsen-logrus diff --git a/registry-token-server/centos/files/token_server.conf b/registry-token-server/files/token_server.conf similarity index 100% rename from registry-token-server/centos/files/token_server.conf rename to registry-token-server/files/token_server.conf