Skip to content

Commit

Permalink
fix build and update version
Browse files Browse the repository at this point in the history
  • Loading branch information
jkarneges committed Dec 6, 2024
1 parent 71c6c2d commit be8d9bd
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ FROM ubuntu:24.10 as build
# Install deps
RUN \
apt-get update && \
apt-get install -y git pkg-config make g++ rustc cargo libssl-dev qtbase5-dev libzmq3-dev libboost-dev
apt-get install -y bzip2 pkg-config make g++ rustc cargo libssl-dev qtbase5-dev libzmq3-dev libboost-dev

WORKDIR /build

ENV VERSION 1.40.1
ARG VERSION

ADD https://github.com/fastly/pushpin/releases/download/v${VERSION}/pushpin-${VERSION}.tar.bz2 .

Expand Down
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,24 @@ This repository contains **Dockerfile** of [Pushpin](http://pushpin.org/) for [D

## Base Docker Image

* [ubuntu:22.04](https://hub.docker.com/_/ubuntu/)
* [ubuntu:24.10](https://hub.docker.com/_/ubuntu/)

## Installation

1. Install [Docker](https://www.docker.com/).

2. Download [automated build](https://hub.docker.com/r/fanout/pushpin/) from public [Docker Hub Registry](https://hub.docker.com/): `docker pull fanout/pushpin`

Alternatively, you can build an image from the `Dockerfile`:
Alternatively, you can build an image from the `Dockerfile`. The easiest way to do this is with `docker-compose`, which picks up the source & image versions from `compose.yaml`:

```sh
docker build -t fanout/pushpin .
docker-compose build
```

Or you can build with `docker` and manually specify the versions:

```sh
docker build --build-arg VERSION={SOURCE_VERSION} -t fanout/pushpin:{IMAGE_VERSION} .
```

## Usage
Expand Down
5 changes: 3 additions & 2 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ services:
pushpin:
build:
context: .
dockerfile: Dockerfile
image: fanout/pushpin:1.40.1
args:
VERSION: 1.40.1
image: fanout/pushpin:1.40.1-1

0 comments on commit be8d9bd

Please sign in to comment.