Permalink
Browse files

Reorganize dockerfiles

  • Loading branch information...
mssun committed Jan 16, 2018
1 parent 4b8cac2 commit 7282425ea9b987b8481cbed3a7c64d4ce3107b23
View
@@ -0,0 +1,2 @@
*
!build/rootfs.tar.xz
View
@@ -15,12 +15,10 @@ pipeline:
image: mesalocklinux/build-mesalock-linux
commands:
- ./mesalockrootfs
- cp build/rootfs.tar.xz mesalockrootfs-dockerfile/
build-docker-image:
image: plugins/docker
repo: mesalocklinux/mesalock-linux
dockerfile: mesalockrootfs-dockerfile/Dockerfile
context: mesalockrootfs-dockerfile
dockerfile: Dockerfile
secrets: [ docker_username, docker_password ]
tags: [ develop ]
when:
@@ -1,7 +1,7 @@
FROM scratch
MAINTAINER Mingshen Sun <sunmingshen@baidu.com>
ADD rootfs.tar.xz /
ADD build/rootfs.tar.xz /
ENV TZ="America/Los_Angeles" RUST_BACKTRACE=1
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
File renamed without changes.
View
@@ -69,7 +69,7 @@ installed. You can build the docker image first and then in the building
container environment, you can build packages, live ISO, and rootfs.
```sh
$ docker build -t mesalocklinux/build-mesalock-linux --rm build-dockerfile
$ docker build --rm -t mesalocklinux/build-mesalock-linux -f Dockerfile.build .
$ docker run -v $(dirname $(pwd)):/mesalock-linux -w /mesalock-linux/mesalock-distro \
-it mesalocklinux/build-mesalock-linux /bin/bash
```
@@ -156,8 +156,8 @@ steps to try MesaLock Linux in VirtualBox.
We provide a simple `Dockerfile` for MesaLock Linux. Here are steps to try
MesaLock Linux in a docker container.
1. Copy rootfs into the docker directory: `cp build/rootfs.tar.xz mesalockrootfs-dockerfile/`
2. Build the docker image: `docker build --rm -t mesalocklinux/mesalock-linux mesalockrootfs-dockerfile`
1. Build packages and rootfs: `./mkpkg && ./mesalockrootfs`
2. Build the docker image: `docker build --rm -t mesalocklinux/mesalock-linux .`
3. Run the image and expeience MesaLock Linux: `docker run --rm -it mesalocklinux/mesalock-linux`
The latest rootfs image with all pacakges are pushed to [Docker

0 comments on commit 7282425

Please sign in to comment.