From 34d8226a4d2a00da97b099f834e5be7116452355 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 6 Jan 2016 15:07:39 +0000 Subject: [PATCH] update to use @avsm Alpine OCaml images Signed-off-by: Justin Cormack --- alpine/packages/9pudfuse/Dockerfile | 12 ++++-------- alpine/packages/9pudfuse/Makefile | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/alpine/packages/9pudfuse/Dockerfile b/alpine/packages/9pudfuse/Dockerfile index 9629de4f2..82b0f4c44 100644 --- a/alpine/packages/9pudfuse/Dockerfile +++ b/alpine/packages/9pudfuse/Dockerfile @@ -1,4 +1,4 @@ -FROM justincormack/alpine-pkgsrc-ocaml:latest +FROM ocaml/opam:alpine-3.3_ocaml-4.02.3 ENV \ OPAMYES=true \ @@ -8,10 +8,6 @@ ENV \ OCAML_TOPLEVEL_PATH="/root/.opam/4.02.3/lib/toplevel" \ PATH=/root/.opam/4.02.3/bin:$PATH -RUN mkdir -p /ocaml/src/9pudfuse -WORKDIR /ocaml/src/9pudfuse - -COPY . /ocaml/src/9pudfuse -RUN opam install result stringext fd-send-recv -RUN ocamlbuild -tag debug -use-ocamlfind -package stringext,fd-send-recv,result fuse_socket_9p.native - +COPY . . +RUN opam depext -i result stringext fd-send-recv +RUN opam config exec -- ocamlbuild -tag debug -use-ocamlfind -package stringext,fd-send-recv,result fuse_socket_9p.native diff --git a/alpine/packages/9pudfuse/Makefile b/alpine/packages/9pudfuse/Makefile index b75d5be35..5f25891a1 100644 --- a/alpine/packages/9pudfuse/Makefile +++ b/alpine/packages/9pudfuse/Makefile @@ -3,7 +3,7 @@ all: 9pudfuse 9pudfuse: Dockerfile fuse_socket_9p.ml docker build -t 9pudfuse:test . docker run 9pudfuse:test \ - cat /ocaml/src/9pudfuse/fuse_socket_9p.native > 9pudfuse + cat fuse_socket_9p.native > 9pudfuse chmod 755 9pudfuse clean: