remix-project-org · ioedeveloper · Jul 27, 2020 · Jul 20, 2020 · Jul 20, 2020 · Jul 20, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -39,7 +39,7 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide apps/remix-ide/background.js apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
     working_directory: ~/remix-project
 
     parallelism: 20
@@ -84,7 +84,7 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide apps/remix-ide/background.js apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
     working_directory: ~/remix-project
 
     parallelism: 20
@@ -127,7 +127,7 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide apps/remix-ide/background.js apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
     working_directory: ~/remix-project
 
     steps:
@@ -170,7 +170,7 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide apps/remix-ide/background.js apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
     working_directory: ~/remix-project
 
     steps:
@@ -189,6 +189,31 @@ jobs:
       - store_artifacts:
           path: ./apps/remix-ide/reports/screenshots
 
+  publish-docker:
+    docker:
+      # specify the version you desire here
+      - image: circleci/node:10.19.0-buster
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+    resource_class: xlarge
+      # - image: circleci/mongo:3.4.4
+    environment:
+      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
+      - COMMIT_AUTHOR: "Circle CI"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide apps/remix-ide/background.js apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+    working_directory: ~/remix-project
+
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run: npm install
+      - run: npm run build:libs
+      - run: npm run downloadsolc_root
+      - run: npm run build
+      - run: ./apps/remix-ide/ci/build_and_publish_docker_images.sh
+
   deploy-remix-alpha:
     docker:
       # specify the version you desire here
@@ -202,7 +227,7 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide apps/remix-ide/background.js apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
     working_directory: ~/remix-project
 
     steps:
@@ -235,6 +260,11 @@ workflows:
       - remix-ide-run-deploy:          
           requires:
             - remix-libs
+      - publish-docker:
+          requires:
+            - remix-ide-chrome
+            - remix-ide-firefox
+            - remix-ide-run-deploy
       - deploy-remix-live:          
           requires:
             - remix-ide-chrome

diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,6 @@
+FROM nginx:alpine
+WORKDIR /
+
+COPY ./temp_publish_docker/ /usr/share/nginx/html/
+
+EXPOSE 80
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -0,0 +1,28 @@
+# This dockerfile is to build each branch seperately (for dev purposes)
+FROM node:10
+# Create Remix user, don't use root!
+# RUN yes | adduser --disabled-password remix && mkdir /app
+# USER remix
+
+# #Now do remix stuff
+# USER remix
+WORKDIR /home/remix
+
+COPY ./ ./
+
+RUN npm ci
+RUN npm run build
+
+FROM nginx:alpine
+WORKDIR /
+
+COPY --from=0 /home/remix/build/ /usr/share/nginx/html/build/
+COPY --from=0 /home/remix/index.html /usr/share/nginx/html/index.html
+COPY --from=0 /home/remix/nginx.conf /etc/nginx/nginx.conf
+COPY --from=0 /home/remix/assets/ /usr/share/nginx/html/assets/
+COPY --from=0 /home/remix/icon.png /usr/share/nginx/html/icon.png
+COPY --from=0 /home/remix/background.js /usr/share/nginx/html/background.js
+COPY --from=0 /home/remix/soljson.js /usr/share/nginx/html/soljson.js
+COPY --from=0 /home/remix/package.json /usr/share/nginx/html/package.json
+
+EXPOSE 80
diff --git a/apps/remix-ide/assets/img/icon.png b/apps/remix-ide/assets/img/icon.png
diff --git a/apps/remix-ide/ci/build_and_publish_docker_images.sh b/apps/remix-ide/ci/build_and_publish_docker_images.sh
@@ -10,6 +10,7 @@ fi
 rm -rf temp_publish_docker
 mkdir temp_publish_docker
 cp -r $FILES_TO_PACKAGE temp_publish_docker
+ls
 
 docker login --username $DOCKER_USER --password $DOCKER_PASS
 docker-compose -f docker-compose.yaml -f build.yaml build

diff --git a/apps/remix-ide/index.html b/apps/remix-ide/index.html
@@ -29,7 +29,7 @@
 		<meta http-equiv="X-UA-Compatible" content="chrome=1">
 		<title>Remix - Ethereum IDE</title>
 		<link rel="stylesheet" href="assets/css/pygment_trac.css">
-		<link rel="icon" type="x-icon" href="icon.png">
+		<link rel="icon" type="x-icon" href="assets/img/icon.png">
 		<script src="assets/js/browserfs.min.js"></script>
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 	</head>

diff --git a/build.yaml b/build.yaml
@@ -0,0 +1,15 @@
+version: "3.7"
+x-project-base:
+  &project-base
+  restart: always
+  networks:
+    - remixide
+
+networks:
+  remixide:
+
+services:
+  remixide:
+    build: 
+      context: .
+      dockerfile: Dockerfile
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -0,0 +1,18 @@
+version: "3.7"
+x-project-base:
+  &project-base
+  restart: always
+  networks:
+    - remixide
+
+networks:
+  remixide:
+
+services:
+  remixide:
+    <<: *project-base
+    image: remixproject/remix-ide:$TAG
+    container_name: remixide-${TAG}
+    ports: 
+      - 8080:80
+      - 65520:65520
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "build_debugger": "browserify apps/remix-ide/src/app/debugger/remix-debugger/index.js -o apps/remix-ide/src/app/debugger/remix-debugger/build/app.js",
     "browsertest": "sleep 5 && npm run nightwatch_local",
     "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='apps/remix-ide/assets/css/font-awesome.min.css' apps/remix-ide/assets/css/",
-    "downloadsolc_root": "wget --no-check-certificate https://solc-bin.ethereum.org/bin/soljson-v0.6.6+commit.6c089d02.js -O soljson.js",
+    "downloadsolc_root": "wget --no-check-certificate https://solc-bin.ethereum.org/bin/soljson-v0.6.6+commit.6c089d02.js -O ./apps/remix-ide/soljson.js",
     "make-mock-compiler": "node apps/remix-ide/ci/makeMockCompiler.js",
     "minify": "uglifyjs --in-source-map inline --source-map-inline -c warnings=false",
     "nightwatch_parallel": "nightwatch -e chrome,firefox --config apps/remix-ide/nightwatch.js",

diff --git a/soljson.js b/soljson.js
diff --git a/workspace.json b/workspace.json
@@ -22,7 +22,7 @@
             "styles": [],
             "scripts": [],
             "webpackConfig": "apps/remix-ide/webpack.config.js",
-            "maxWorkers": 6
+            "maxWorkers": 2
           },
           "configurations": {
             "production": {