Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

edit docker-compose and Dockerfile (version and dependencies) #8

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 5 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,25 +64,19 @@ A redis container is required, e.g redis:alpine or yobasystems/alpine-redis to b

### Getting Started

To forward all external traffic from port 80 to the container’s port 8080

```sh
$ docker run -d --name xen-orchestra -p 80:8080 yobasystems/alpine-xen-orchestra ./bin/xo-server
```

Point your browser to `http://host-ip`.
Build local image:

## Docker Compose example:

```yalm
version: '2'
services:
xen-orchestra:
image: yobasystems/alpine-xen-orchestra:latest
container_name: xoa
build: .
command: ./bin/xo-server
container_name: xoa
ports:
- "8080:8080"
- "8000:8080"
depends_on:
- redis
environment:
Expand All @@ -95,18 +89,9 @@ services:
command: redis-server --appendonly yes
volumes:
- /data/xoa/redis:/data

```

## Source Repository

* [Bitbucket - yobasystems/alpine-xen-orchestra](https://bitbucket.org/yobasystems/alpine-xen-orchestra/)

* [Github - yobasystems/alpine-xen-orchestra](https://github.com/yobasystems/alpine-xen-orchestra)

## Links

* [Yoba Systems](https://www.yobasystems.co.uk/)

* [Dockerhub - yobasystems](https://hub.docker.com/u/yobasystems/)

* [Quay.io - yobasystems](https://quay.io/organization/yobasystems)
10 changes: 5 additions & 5 deletions alpine-xen-orchestra-amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM yobasystems/alpine:3.8-amd64 as xoa-builder

FROM alpine:3.12 as xoa-builder
#edit by marllus lustosa - https://github.com/marlluslustosa/alpine-xen-orchestra
WORKDIR /app

RUN apk add --no-cache bash git build-base git curl nodejs python libstdc++ make gcc g++ libpng-dev yarn
RUN apk add --no-cache bash git build-base git curl nodejs python2 libstdc++ make gcc g++ libpng-dev yarn

RUN git clone -b master https://github.com/vatesfr/xen-orchestra && \
rm -rf /app/xen-orchestra/.git && \
Expand All @@ -16,15 +16,15 @@ COPY files/config.yaml xen-orchestra/packages/xo-server/.xo-server.yaml
RUN cd /app/xen-orchestra && \
yarn && yarn build

FROM yobasystems/alpine:3.8-amd64
FROM alpine:3.12

ARG BUILD_DATE
ARG VCS_REF

LABEL maintainer="Dominic Taylor <[email protected]>" \
architecture="amd64/x86_64" \
xenorchestra-version="5.47.0" \
alpine-version="3.8" \
alpine-version="3.12" \
build="20-Aug-2019" \
org.opencontainers.image.title="alpine-xen-orchestra" \
org.opencontainers.image.description="Xen Orchestra Docker image running on Alpine Linux" \
Expand Down
4 changes: 2 additions & 2 deletions alpine-xen-orchestra-amd64/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2'
services:
xen-orchestra:
image: yobasystems/alpine-xen-orchestra:amd64
build: .
command: ./bin/xo-server
container_name: xoa
ports:
Expand All @@ -14,7 +14,7 @@ services:
- /data/xoa/server:/app/data
redis:
container_name: xoa-redis
image: yobasystems/alpine-redis:amd64
image: redis:alpine
command: redis-server --appendonly yes
volumes:
- /data/xoa/redis:/data