Archives
/
git-secret
mirror of https://github.com/sobolevn/git-secret
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Issue487 fedora buids (#511)

Browse Source 
* use python3 and pip3

* upgrade to ansible 2.8.4

* set ansible_python_interpreter

* fix: enable debian sources when haven't found them

* updates to changelog
pull/513/head
Josh Rabinowitz 5 years ago committed by GitHub
parent 99b36b2b52
commit b7741a0ade
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 57 additions and 46 deletions
Show Stats Download Patch File Download Diff File

6
.Dockerfiles/alpine/latest/Dockerfile
Unescape Escape View File

@ -16,12 +16,12 @@ RUN apk add --no-cache --update \
openssh-sftp-server \
openssl-dev \
py-boto \
py2-pip \
python2-dev \
py-pip \
python3-dev \
rsyslog \
sudo \
xz \
&& pip install --upgrade pip \
&& pip3 install --upgrade pip \
&& if ! getent passwd <%= @username %>; then \
adduser -h /home/<%= @username %> -s /bin/bash -D <%= @username %>; \
passwd -d <%= @username %>; \

6
.Dockerfiles/debian/latest/Dockerfile
Unescape Escape View File

@ -11,11 +11,11 @@ RUN apt-get update \
lsb-release \
net-tools \
openssh-server \
python-pip \
python2.7 \
python3-pip \
python3 \
sudo \
systemd \
&& pip install --upgrade pip \
&& pip3 install --upgrade pip \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
&& if ! getent passwd <%= @username %>; then \

7
.Dockerfiles/fedora/latest/Dockerfile
Unescape Escape View File

@ -13,13 +13,14 @@ RUN dnf clean all \
net-tools \
openssh-server \
openssl-devel \
python2-devel \
python2-pip \
python3-devel \
python3-pip \
python3-dnf \
redhat-lsb \
redhat-rpm-config \
sudo \
systemd \
&& pip install --upgrade pip \
&& pip3 install --upgrade pip \
&& dnf clean all \
&& if ! getent passwd <%= @username %>; then \
useradd -d /home/<%= @username %> -m -s /usr/bin/bash -p '*' <%= @username %>; \

6
.Dockerfiles/ubuntu/latest/Dockerfile
Unescape Escape View File

@ -11,11 +11,11 @@ RUN apt-get update \
lsb-release \
net-tools \
openssh-server \
python-pip \
python2.7 \
python3-pip \
python3 \
sudo \
systemd \
&& pip install --upgrade pip \
&& pip3 install --upgrade pip \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
&& if ! getent passwd <%= @username %>; then \

6
.Dockerfiles/ubuntu/rolling/Dockerfile
Unescape Escape View File

@ -12,11 +12,11 @@ RUN apt-get update \
lsb-release \
net-tools \
openssh-server \
python-pip \
python2.7 \
python3-pip \
python3 \
sudo \
systemd \
&& pip install --upgrade pip \
&& pip3 install --upgrade pip \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
&& if ! getent passwd <%= @username %>; then \

8
.ci/ansible-setup.sh
Unescape Escape View File

@ -7,12 +7,12 @@ set -e
# What version of avm setup to use
echo "Setting up Ansible Version Manager"
AVM_VERSION="v1.0.0"
## Install Ansible 2.5.X using pip and label it 'v2.5'
export ANSIBLE_VERSIONS_0="2.5.0.0"
## Install Ansible using pip and label it
export ANSIBLE_VERSIONS_0="2.8.4.0"
export INSTALL_TYPE_0="pip"
export ANSIBLE_LABEL_0="v2.5"
export ANSIBLE_LABEL_0="v2.8"
# Whats the default version
export ANSIBLE_DEFAULT_VERSION="v2.5"
export ANSIBLE_DEFAULT_VERSION="v2.8"
## Create a temp dir to download avm
avm_dir="$(mktemp -d 2> /dev/null || mktemp -d -t 'mytmpdir')"

4
.ci/before_script.sh
Unescape Escape View File

@ -5,13 +5,13 @@ set -e
# Linux helper functions:
function update_linux() {
sudo apt-get update -qq
sudo apt-get install -qq python-apt python-pycurl git python-pip build-essential autoconf rpm
sudo apt-get install -qq python3-apt python3-pycurl git python3-pip build-essential autoconf rpm
}
function install_ansible {
bash .ci/ansible-setup.sh
# pyOpen, ndg-* and pyasn1 are for 'InsecurePlatformWarning' error
~/.avm/v2.5/venv/bin/pip install netaddr ansible-lint pyOpenSSL ndg-httpsclient pyasn1
~/.avm/v2.8/venv/bin/pip install netaddr ansible-lint pyOpenSSL ndg-httpsclient pyasn1
}

6
.ci/integration/gnupg-git/default.yml
Unescape Escape View File

@ -19,7 +19,7 @@
- name: Set deb-src check results
set_fact:
deb_src_check_result: "{{ deb_src_check.stdout | default(0) | int }}"
deb_src_check_result: "{{ deb_src_check.stdout | default(0) }}"
- name: Enable Ubuntu main & restricted source repo
replace:
@ -28,7 +28,7 @@
replace: '\2 # enabled'
when:
- ansible_distribution == "Ubuntu"
- deb_src_check_result >= 1
- deb_src_check_result|int < 1
- name: Remove dpkg excludes on Ubuntu
replace:
@ -45,7 +45,7 @@
replace: '\1\2\ndeb-src\2'
when:
- ansible_distribution == "Debian"
- deb_src_check_result >= 1
- deb_src_check_result|int < 1
- name: Install gnupg build dependencies for Debian based distros
apt:

1
.ci/integration/vars/Alpine.yml
Unescape Escape View File

@ -1,4 +1,5 @@
---
ansible_python_interpreter: /usr/bin/python3
test_dependencies:
- gawk
- git

1
.ci/integration/vars/Fedora.yml
Unescape Escape View File

@ -1,4 +1,5 @@
---
ansible_python_interpreter: /usr/bin/python3
test_dependencies:
- gawk
- git

1
.ci/integration/vars/Ubuntu.yml
Unescape Escape View File

@ -1,4 +1,5 @@
---
ansible_python_interpreter: /usr/bin/python3
test_dependencies:
- gawk
- git

1
.ci/integration/vars/default.yml
Unescape Escape View File

@ -1,4 +1,5 @@
---
ansible_python_interpreter: /usr/bin/python3
test_dependencies:
- gawk
- make

4
.ci/script.sh
Unescape Escape View File

@ -5,8 +5,8 @@ set -e
function run_kitchen_tests {
ansible --version
ruby --version
python --version
pip --version
python3 --version
pip3 --version
bundler --version
bundle show
bundle exec kitchen test --test-base-path="$PWD/.ci/integration" $KITCHEN_REGEXP

2
.kitchen.yml
Unescape Escape View File

@ -11,7 +11,7 @@ provisioner:
ansible_verbose: false
require_ansible_repo: false
require_ansible_omnibus: true
ansible_version: 2.5.0
ansible_version: 2.8.4
require_chef_for_busser: false
sudo_command: sudo -E -H
idempotency_test: false

36
.travis.yml
Unescape Escape View File

@ -32,12 +32,12 @@ matrix:
sudo: required
language: ruby
rvm: 2.6
#- os: linux
# env: KITCHEN_REGEXP="gnupg1-fedora-latest"
# services: docker
# sudo: required
# language: ruby
# rvm: 2.6
- os: linux
env: KITCHEN_REGEXP="gnupg1-fedora-latest"
services: docker
sudo: required
language: ruby
rvm: 2.6
- os: linux
env: KITCHEN_REGEXP="gnupg1-ubuntu-latest"
services: docker
@ -64,12 +64,12 @@ matrix:
language: ruby
rvm: 2.6
# distribute rpm on this successful test
#- os: linux
# env: KITCHEN_REGEXP="gnupg2-fedora-latest"; GITSECRET_DIST="rpm"
# services: docker
# sudo: required
# language: ruby
# rvm: 2.6
- os: linux
env: KITCHEN_REGEXP="gnupg2-fedora-latest"; GITSECRET_DIST="rpm"
services: docker
sudo: required
language: ruby
rvm: 2.6
- os: linux
env: KITCHEN_REGEXP="gnupg2-ubuntu-latest"
services: docker
@ -82,12 +82,12 @@ matrix:
sudo: required
language: ruby
rvm: 2.6
#- os: linux
# env: KITCHEN_REGEXP="gnupg-git-fedora-latest"
# services: docker
# sudo: required
# language: ruby
# rvm: 2.6
- os: linux
env: KITCHEN_REGEXP="gnupg-git-fedora-latest"
services: docker
sudo: required
language: ruby
rvm: 2.6
- os: linux
env: KITCHEN_REGEXP="gnupg-git-ubuntu-latest"
services: docker

8
CHANGELOG.md
Unescape Escape View File

@ -2,10 +2,13 @@
## {{Next Version}}
### Features
- Support SECRETS_PINENTRY env var for gnupg --pinentry-mode parameter (#221)
### Bugfixes
- Use OSX's mktemp on OSX, even if there's another version in PATH. (#485)
- Support SECRETS_PINENTRY env var for gnupg --pinentry-mode parameter (#221)
- Make rsync a build requirement on debian (#500)
- When tests specify gnupg1, use gnupg1, not gnupg2 (#241)
- Ignore revoked gnupg keys (#508)
@ -13,6 +16,9 @@
## Misc
- Add note about secrets and old keys (#499)
- Transition build process from python 2 to python 3 (#487)
- Upgrade build process from ansible 2.5 to ansible 2.8
- Fix in build process when installing gnupg2 source deps on Ubuntu
- Improve code comments
## Version 0.2.6

Write Preview
Loading…
Cancel
Save