Skip to content

Commit

Permalink
Merge pull request #27 from linyows/bionic
Browse files Browse the repository at this point in the history
Support bionic
  • Loading branch information
linyows authored Jul 1, 2018
2 parents 497ab66 + e496429 commit f859238
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 0 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ packagecloud_release: ## Upload archives to PackageCloud on Mac
go get github.com/mlafeldt/pkgcloud/...
pkgcloud-push linyows/octopass/el/7 builds/octopass-$(VERSION)-1.x86_64.el7.rpm
pkgcloud-push linyows/octopass/el/6 builds/octopass-$(VERSION)-1.x86_64.el6.rpm
pkgcloud-push linyows/octopass/ubuntu/bionic builds/octopass_$(VERSION)-1_amd64.bionic.deb
pkgcloud-push linyows/octopass/ubuntu/xenial builds/octopass_$(VERSION)-1_amd64.xenial.deb
pkgcloud-push linyows/octopass/ubuntu/trusty builds/octopass_$(VERSION)-1_amd64.trusty.deb
pkgcloud-push linyows/octopass/ubuntu/precise builds/octopass_$(VERSION)-1_amd64.precise.deb
Expand Down
8 changes: 8 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ centos6:
DIST: el6
command: make rpm

ubuntu18:
dockerfile: dockerfiles/Dockerfile.ubuntu-18
build: .
volumes:
- .:/octopass
environment:
DIST: bionic
command: make deb
ubuntu16:
dockerfile: dockerfiles/Dockerfile.ubuntu-16
build: .
Expand Down
11 changes: 11 additions & 0 deletions dockerfiles/Dockerfile.ubuntu-18
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM ubuntu:bionic
MAINTAINER linyows <[email protected]>

RUN apt-get -qq update && \
apt-get install -qq glibc-source gcc make libcurl4-gnutls-dev libjansson-dev \
bzip2 unzip debhelper dh-make devscripts cdbs clang

ENV USER root

RUN mkdir /octopass
WORKDIR /octopass

0 comments on commit f859238

Please sign in to comment.