Skip to content

Commit

Permalink
Merge pull request #2 from terencewestphal/develop
Browse files Browse the repository at this point in the history
Update Minecraft Server to version 1.12
  • Loading branch information
Terence Westphal authored Jun 9, 2017
2 parents 3544ed3 + c6df3e6 commit 385c343
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM openjdk:alpine
LABEL maintainer "Terence Westphal"

# Use default value if the build argument is not set
ARG VERSION=1.11.2
ARG VERSION=1.12

ENV MC_VERSION=${VERSION}
ENV PACKAGE="/opt/minecraft"
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/terencewestphal/docker-minecraft.svg?branch=develop)](https://travis-ci.org/terencewestphal/docker-minecraft) [![Docker Build Statu](https://img.shields.io/docker/build/terencewestphal/minecraft.svg)](https://hub.docker.com/r/terencewestphal/minecraft/builds/) ![Docker Stars](https://img.shields.io/docker/stars/terencewestphal/minecraft.svg) [![Docker Pulls](https://img.shields.io/docker/pulls/terencewestphal/minecraft.svg)](https://hub.docker.com/r/terencewestphal/minecraft/)
[![Docker Build Statu](https://img.shields.io/docker/build/terencewestphal/minecraft.svg)](https://hub.docker.com/r/terencewestphal/minecraft/builds/) ![Docker Stars](https://img.shields.io/docker/stars/terencewestphal/minecraft.svg) [![Docker Pulls](https://img.shields.io/docker/pulls/terencewestphal/minecraft.svg)](https://hub.docker.com/r/terencewestphal/minecraft/)

[![Minecraft](https://github.com/terencewestphal/docker-minecraft/blob/master/logo.png?raw=true)](https://minecraft.net/)

Expand All @@ -11,7 +11,8 @@

## Supported tags and Dockerfile

- `1.11.2`, `latest` ([Dockerfile](https://raw.githubusercontent.com/terencewestphal/docker-minecraft/1.11.2/Dockerfile))
- `1.12`, `latest` ([Dockerfile](https://raw.githubusercontent.com/terencewestphal/docker-minecraft/1.12/Dockerfile))
- `1.11.2` ([Dockerfile](https://raw.githubusercontent.com/terencewestphal/docker-minecraft/1.11.2/Dockerfile))


### Pull
Expand All @@ -23,7 +24,7 @@ docker pull terencewestphal/minecraft:latest

Get a specific version:
```
docker pull terencewestphal/minecraft:1.11.2
docker pull terencewestphal/minecraft:1.12
```

### Build
Expand All @@ -35,7 +36,7 @@ docker build -t minecraft .

Optional: Build with a specific Minecraft version:
```
docker build --build-arg VERSION=1.11.2 -t minecraft .
docker build --build-arg VERSION=1.12 -t minecraft .
```

### Run
Expand Down

0 comments on commit 385c343

Please sign in to comment.