Skip to content

Commit f46ac82

Browse files
committed
Add automated goreleaser build, fix key test
1 parent 2617592 commit f46ac82

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

.travis.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
sudo: required
2+
language: go
3+
addons:
4+
apt:
5+
packages:
6+
# needed for the nfpm pipe:
7+
- rpm
28

39
services:
410
- docker
511

612
script:
713
- make e2e-test
14+
15+
16+
# calls goreleaser
17+
deploy:
18+
- provider: script
19+
skip_cleanup: true
20+
script: curl -sL https://git.io/goreleaser | bash
21+
on:
22+
tags: true
23+
condition: $TRAVIS_OS_NAME = linux

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ build:
55
test:
66
go test -v -short ./...
77
e2e-test:
8-
docker-compose run --rm auditor go test -v ./...
8+
docker-compose run --rm auditor go test -v ./... || (docker logs sshauditor_alpine-sshd-test-key_1 ; false )
99
static:
1010
go get -t -v ./...
1111
go build --ldflags '-extldflags "-static"'

testing/docker/alpine-sshd-test-key/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ FROM alpine
22
RUN apk update
33
RUN apk add openssh
44
RUN ssh-keygen -A
5+
RUN echo LogLevel DEBUG >> /etc/ssh/sshd_config
56
RUN echo -e "XXX\nXXX"|adduser test
67
RUN mkdir /home/test/.ssh
78
ADD test.pub /home/test/.ssh/authorized_keys
8-
RUN chmod 0755 /home/test /home/test/.ssh && \
9-
chown 0644 /home/test/.ssh/authorized_keys && \
10-
chown test: /home/test/.ssh /home/test/.ssh/authorized_keys
11-
RUN ls -la /home /home/test /home/test/.ssh
9+
RUN chmod 0700 /home/test /home/test/.ssh && \
10+
chmod 0600 /home/test/.ssh/authorized_keys && \
11+
chown test:test /home/test/.ssh /home/test/.ssh/authorized_keys
1212
EXPOSE 22
13-
CMD ["/usr/sbin/sshd", "-D"]
13+
CMD ["/usr/sbin/sshd", "-De"]

0 commit comments

Comments
 (0)