Skip to content

Commit 05c8590

Browse files
update to centos
1 parent 0cad96c commit 05c8590

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

.travis.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,9 @@ dist: xenial
33
language: python
44
python: 3.7
55
services: docker
6-
env:
7-
- OS_VERSION=bionic GIT_URL=https://github.com/ceph/ceph GIT_REF=octopus IMG="popperized/ceph-builder:octopus-bionic"
8-
- OS_VERSION=bionic GIT_URL=https://github.com/ceph/ceph GIT_REF=nautilus IMG="popperized/ceph-builder:nautilus-bionic"
9-
- OS_VERSION=bionic GIT_URL=https://github.com/ceph/ceph GIT_REF=mimic IMG="popperized/ceph-builder:mimic-bionic"
10-
- OS_VERSION=bionic GIT_URL=https://github.com/uccross/skyhook-ceph GIT_REF=skyhook-luminous IMG="popperized/ceph-builder:skyhook-bionic"
116
install:
127
- git clone https://github.com/systemslab/popper /tmp/popper
138
- export PYTHONUNBUFFERED=1
149
- pip install /tmp/popper/cli
1510
script: >-
16-
popper run -f ci/wf.yml \
17-
--substitution "_OS_VERSION=$OS_VERSION" \
18-
--substitution "_GIT_URL=$GIT_URL" \
19-
--substitution "_GIT_REF=$GIT_REF" \
20-
--substitution "_IMG=$IMG"
11+
popper run -f ci/wf.yml

Dockerfile

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
ARG OS_VERSION=bionic
2-
FROM ubuntu:${OS_VERSION}
1+
FROM centos:7.8.2003
32

4-
ARG DEBIAN_FRONTEND=noninteractive
5-
ARG GIT_URL="https://github.com/ceph/ceph"
6-
ARG GIT_REF="master"
3+
ARG GIT_URL="https://github.com/uccross/skyhookdm-ceph"
4+
ARG GIT_REF="skyhook-luminous"
75
ARG EXTRA_PKGS=""
86

9-
RUN apt-get update && \
10-
apt-get install -y git gnupg2 ccache && \
7+
ADD . /
8+
9+
RUN ./install-preq.sh && \
1110
git clone --branch $GIT_REF --depth 1 $GIT_URL ceph && \
1211
cd ceph && \
1312
./install-deps.sh && \
1413
sh -c 'if [ -n "$EXTRA_PKGS" ]; then apt-get install -y "$EXTRA_PKGS"; fi' && \
15-
apt-get clean -y && \
16-
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* debian/
14+
yum clean all
1715

1816
COPY entrypoint.sh /
1917

ci/wf.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
steps:
22
- uses: docker://docker:19.03.3
3-
args: ['build',
4-
'--build-arg', 'OS_VERSION=$_OS_VERSION',
5-
'--build-arg', 'GIT_URL=$_GIT_URL',
6-
'--build-arg', 'GIT_REF=$_GIT_REF',
7-
'--tag', '$_IMG',
8-
'.'
9-
]
3+
args: ['build',
4+
'--build-arg', 'GIT_URL=https://github.com/uccross/skyhookdm-ceph',
5+
'--build-arg', 'GIT_REF=skyhook-luminous',
6+
'-t', 'jcnitdgp25/ceph-builder:skyhook-luminous-centos',
7+
'.'
8+
]
109

1110
- uses: docker://docker:19.03.3
12-
runs: /bin/sh
11+
runs: ['/bin/sh']
1312
secrets: [DOCKER_USERNAME, DOCKER_PASSWORD]
1413
args:
1514
- -c
1615
- |
1716
docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
18-
docker push $_IMG
17+
docker push jcnitdgp25/ceph-builder:skyhook-luminous-centos

install-preq.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
set -ex
3+
4+
# yum update -y
5+
yum install -y centos-release-scl scl-utils epel-release
6+
yum install -y git wget gnupg2 ccache
7+
yum install -y python-pip
8+
yum install -y devtoolset-8 devtoolset-7
9+
# pip install --upgrade pip
10+
# pip install --upgrade virtualenv
11+
scl enable devtoolset-8 bash
12+
scl enable devtoolset-7 bash

0 commit comments

Comments
 (0)