فهرست منبع

Update notes.

Rob Austein 6 سال پیش
والد
کامیت
8b18f65526
4فایلهای تغییر یافته به همراه14 افزوده شده و 5 حذف شده
  1. 1 1
      .gitignore
  2. 2 2
      Makefile
  3. 10 0
      README.md
  4. 1 2
      stage2/Dockerfile

+ 1 - 1
.gitignore

@@ -1,5 +1,5 @@
 framebuf/Xvfb_screen0
-screenlog.0
+screenlog.*
 *.stamp
 Xilinx_ISE_DS_Lin_14.7_1015_1.tar
 Xilinx.lic

+ 2 - 2
Makefile

@@ -1,11 +1,11 @@
-all: build
+all: debug
 
 build: stage0.stamp stage1.stamp stage2.stamp # stage3.stamp
 
 debug: stage2.stamp
 	docker container prune -f
 	mkdir -p framebuf
-	docker run -it --mount type=bind,source=$(abspath framebuf),target=/framebuf xilinx:intalled
+	docker run -it --mount type=bind,source=$(abspath framebuf),target=/framebuf xilinx:installed /xilinx-unpack/installer
 
 stage0.stamp:
 	mkdir -p stage0/jessie_chroot

+ 10 - 0
README.md

@@ -153,3 +153,13 @@ even need to convert from `xwd` format to something more common, we
 can just `shutil.copyfile()` the frame buffer file and leave the
 results for somebody else to deal with.  If anything is going to keep
 those they should probably be converted to png but not critical.
+
+OK, confirmed that the problem with running `Xvfb` is (somehow)
+specific to running under `docker build`.  Same configuration (packge
+list, etc) ran (apparently) fine under `docker run`.
+
+Attempting to `docker commit` the result blew out what was left of my
+disk space.  Since we're going to want to clean up and collapse
+anyway, it's possible that `docker container export` is a better path
+than commit here: would have to feed the result to `docker import` to
+get an image, but that might be exactly what we want.

+ 1 - 2
stage2/Dockerfile

@@ -10,6 +10,5 @@ RUN apt-get update && apt-get install -y \
 
 COPY installer /xilinx-unpack/
 
-RUN  /xilinx-unpack/installer
-
+#RUN /xilinx-unpack/installer
 #RUN rm -rf /xilinx-unpack