Update for docker version

- Move ENSL Packge to pkg
- Update dockerfile to work
- Add more base amxx files

Dockerfile

@@ -2,16 +2,16 @@ FROM ubuntu
 
 # Need to install GCC-MULTILIB to be able to run amxxpc
 RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y wget git vim curl ca-certificates gcc-multilib hashalot
+RUN apt-get install -y wget git vim curl ca-certificates gcc-multilib hashalot unzip zip
 
-RUN useradd -m amxx && mkdir -p /var/build && chown -R amxx:amxx /var/build
+RUN useradd -m amxx && mkdir -p /var/build/pkg && chown -R amxx:amxx /var/build
 
 USER amxx
 WORKDIR /home/amxx
 RUN wget -q -O amxx.tgz "https://www.amxmodx.org/release/amxmodx-1.8.2-base-linux.tar.gz" && \
     wget -q -O amxx_ns.tgz "https://www.amxmodx.org/release/amxmodx-1.8.2-ns-linux.tar.gz" && \
-    wget -q -O amxx_ns.tgz "https://www.amxmodx.org/release/amxmodx-1.8.2-ns-linux.tar.gz" && \
-    wget -q -O amxx_ns.tgz "https://www.amxmodx.org/release/amxmodx-1.8.2-ns-linux.tar.gz" && \
+    wget -q -O amxx.zip "https://www.amxmodx.org/release/amxmodx-1.8.2-base-windows.zip" && \
+    wget -q -O amxx_ns.zip "http://www.amxmodx.org/release/amxmodx-1.8.2-ns-windows.zip"
 
 COPY files/amxmodx.sha /home/amxx
 RUN sha256sum -c amxmodx.sha
@@ -20,10 +20,12 @@ RUN tar -zxf amxx.tgz && tar -zxf amxx_ns.tgz
 
 WORKDIR /home/amxx/addons/amxmodx/scripting
 
-COPY src/*.* /home/amxx/addons/amxmodx/scripting/
-COPY src/include/*  /home/amxx/addons/amxmodx/scripting/include
+COPY --chown=amxx src/ensl.sh /home/amxx/
+COPY --chown=amxx src/*.sma /home/amxx/addons/amxmodx/scripting/
+COPY --chown=amxx src/include/*  /home/amxx/addons/amxmodx/scripting/include
+COPY --chown=amxx pkg /var/pkg
 
 # RUN ./amxxpc ENSL.sma && cp ENSL.sma /var/build
 
 USER root
-ENTRYPOINT ["/home/amxx/addons/amxmodx/scripting/compile.sh", "ENSL.sma"]
+ENTRYPOINT ["/home/amxx/ensl.sh", "ENSL.sma"]

Makefile

@@ -1,11 +1,11 @@
-REGISTRY ?= ensl
+#REGISTRY ?= ensl
 PROJECT  ?= ensl-plugin
 TAG      ?= latest
 
 ifdef REGISTRY
   IMAGE=$(REGISTRY)/$(PROJECT):$(TAG)
 else
-  IMAGE=$(PROJECT):$(TAG)
+  IMAGE=$(PROJECT)
 endif
 
 all:
@@ -16,7 +16,7 @@ all:
 	@echo "  * test  - build and test $(IMAGE)"
 
 build: Dockerfile
-	docker build -t $(IMAGE) .
+	docker build . -t $(IMAGE)
 
 run: build
 	docker run -v $(shell pwd)/build/:/var/build -ti $(IMAGE)
@@ -28,7 +28,7 @@ push:
 	docker push $(IMAGE)
 
 clean:
-	rm -f $(shell pwd)/build/*
+	rm -rf $(shell pwd)/build/*
 
 test: build
 	@echo "TODO"

src/compile.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-./amxxpc $1
-cp $1 /var/build

src/ensl.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+cd /home/amxx/addons/amxmodx/scripting
+
+./amxxpc $1
+cp *.amxx /var/build
+
+cd /home/amxx
+
+mkdir -p /var/build/tmp /var/build/pkg
+
+yes|unzip -f amxx.zip -d /var/build/tmp/
+yes|unzip -f amxx_ns.zip -d /var/build/tmp/
+tar -zxf amxx.tgz -C /var/build/tmp/
+tar -zxf amxx_ns.tgz -C /var/build/tmp/
+
+cp -ra /var/pkg/* /var/build/pkg
+
+cd /var/build/pkg/
+
+cp -ra ../tmp/metamod/ .
+cp -ra ../tmp/addons/amxmodx/modules/* addons/amxmodx/modules/
+cp -ra ../tmp/addons/amxmodx/data/* addons/amxmodx/data/
+cp -ra ../tmp/addons/amxmodx/dlls/* addons/amxmodx/dlls/
+cp ../ENSL.amxx addons/amxmodx/scripting/plugins/
+
+zip -r ENSL_SrvPkg.zip *