Skip to content

Commit 5bf7cf7

Browse files
author
ozelot379
committed
Merge branch 'develop' into 'master'
Develop See merge request minecraft/convert-minecraft-java-texture-to-bedrock/webapp!46
2 parents a44aecc + 6e402e1 commit 5bf7cf7

4 files changed

Lines changed: 34 additions & 14 deletions

File tree

‎Dockerfile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM node:14-alpine as build
2+
3+
COPY . /src
4+
WORKDIR /src
5+
6+
ENV NODE_ENV development
7+
RUN yarn
8+
9+
ENV NODE_ENV production
10+
RUN yarn build
11+
12+
RUN cp -r build /build
13+
WORKDIR /build
14+
RUN rm -rf /src
15+
16+
FROM httpd:alpine
17+
18+
COPY --from=build /build /usr/local/apache2/htdocs

‎README.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ THIS PROJECT IS NO OFFICIAL MINECRAFT PRODUCT - NOT AUTHORIZED OR ASSOCIATED BY
22

33
---
44

5-
# Convert Minecraft Java texture packs to Bedrock texture packs
5+
# Web app for convert Minecraft Java texture packs to Bedrock texture packs
66

77
## Description
88

@@ -54,8 +54,20 @@ Internet Explorer or old Edge are not supported!
5454

5555
## Web app
5656

57+
The latest version is available through Github page
58+
5759
Look at https://ozelot379.github.io/ConvertJavaTextureToBedrock
5860

61+
### Docker
62+
63+
You can also use the web app with Docker like
64+
65+
```bash
66+
docker run --rm -p 127.0.0.1:8080:80 ozelot379/convert-minecraft-java-texture-to-bedrock-webapp
67+
```
68+
69+
Look at https://hub.docker.com/r/ozelot379/convert-minecraft-java-texture-to-bedrock-webapp
70+
5971
## CLI
6072

6173
Look at https://github.com/ozelot379/ConvertJavaTextureToBedrockCli

‎package.json‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-webapp",
33
"productName": "ConvertJavaTextureToBedrock",
4-
"version": "3.4.0",
4+
"version": "3.4.1",
55
"description": "Web app for convert Minecraft Java texture packs to Bedrock texture packs",
66
"keywords": [
77
"Minecraft",
@@ -23,12 +23,11 @@
2323
"homepage": "https://github.com/ozelot379/ConvertJavaTextureToBedrock#readme",
2424
"dependencies": {},
2525
"devDependencies": {
26-
"@ozelot379/convert-minecraft-java-texture-to-bedrock": "3.4.0",
26+
"@ozelot379/convert-minecraft-java-texture-to-bedrock": "3.4.1",
2727
"clean-webpack-plugin": "3.0.0",
2828
"css-loader": "3.4.2",
2929
"favicons-webpack-plugin": "1.0.2",
3030
"file-saver": "https://github.com/eligrey/FileSaver.js/tarball/9a0a1e4ae2732c2d8eedc0214ef1c0fa32d15150",
31-
"gh-pages": "2.2.0",
3231
"html-webpack-plugin": "3.2.0",
3332
"less": "3.11.1",
3433
"less-loader": "5.0.0",
@@ -40,7 +39,6 @@
4039
"sweetalert": "2.1.2",
4140
"webpack": "4.42.0",
4241
"webpack-cli": "3.3.11",
43-
"webpack-dev-server": "3.10.3",
4442
"worker-loader": "2.0.0"
4543
},
4644
"resolutions": {
@@ -50,9 +48,7 @@
5048
"node": ">=14.0.0"
5149
},
5250
"scripts": {
53-
"build": "webpack",
54-
"debug": "webpack-dev-server",
55-
"publish": "yarn build && gh-pages -d ./build"
51+
"build": "webpack"
5652
},
5753
"private": true
5854
}

‎webpack.config.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ const TerserJSPlugin = require("terser-webpack-plugin");
1010
const isDebug = (process.env.NODE_ENV === "development");
1111

1212
module.exports = {
13-
devServer: {
14-
disableHostCheck: true,
15-
host: "127.0.0.1",
16-
open: true,
17-
port: 8080
18-
},
1913
devtool: false,
2014
entry: {
2115
index: "./src/js/index.js"

0 commit comments

Comments
 (0)